diff --git a/Source/Nakatomi/Weapon.cpp b/Source/Nakatomi/Weapon.cpp
index 43cca20..dcfb7d6 100644
--- a/Source/Nakatomi/Weapon.cpp
+++ b/Source/Nakatomi/Weapon.cpp
@@ -19,14 +19,14 @@ void AWeapon::BeginPlay()
 	
 }
 
-USkeletalMeshComponent* AWeapon::GetSkeletalMesh()
+USkeletalMesh* AWeapon::GetSkeletalMesh()
 {
 	return WeaponSkeletalMesh;
 }
 
-void AWeapon::SetSkeletalMesh(USkeletalMeshComponent* USkeletalMeshComponent)
+void AWeapon::SetSkeletalMesh(USkeletalMesh* USkeletalMesh)
 {
-	WeaponSkeletalMesh = USkeletalMeshComponent;
+	WeaponSkeletalMesh = USkeletalMesh;
 }
 
 TEnumAsByte<WeaponState>* AWeapon::GetCurrentWeaponStatus()
diff --git a/Source/Nakatomi/Weapon.h b/Source/Nakatomi/Weapon.h
index 807dbbf..b36497b 100644
--- a/Source/Nakatomi/Weapon.h
+++ b/Source/Nakatomi/Weapon.h
@@ -28,7 +28,7 @@ class NAKATOMI_API AWeapon : public AActor
 protected:
 
 	UPROPERTY(EditDefaultsOnly)
-	USkeletalMeshComponent* WeaponSkeletalMesh;
+	USkeletalMesh* WeaponSkeletalMesh = nullptr;
 
 	UPROPERTY(EditDefaultsOnly)
 	TEnumAsByte<WeaponState> CurrentWeaponStatus;
@@ -57,9 +57,9 @@ protected:
 	virtual void BeginPlay() override;
 
 public:
-	USkeletalMeshComponent* GetSkeletalMesh();
+	USkeletalMesh* GetSkeletalMesh();
 
-	void SetSkeletalMesh(USkeletalMeshComponent* USkeletalMeshComponent);
+	void SetSkeletalMesh(USkeletalMesh* USkeletalMesh);
 
 	TEnumAsByte<WeaponState>* GetCurrentWeaponStatus();