diff --git a/Source/Nakatomi/PlayerCharacter.cpp b/Source/Nakatomi/PlayerCharacter.cpp
index 98a2057..db3f6fe 100644
--- a/Source/Nakatomi/PlayerCharacter.cpp
+++ b/Source/Nakatomi/PlayerCharacter.cpp
@@ -265,9 +265,17 @@ void APlayerCharacter::ProcessHits(TArray<FHitResult> hits)
 		SpawnParameters.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
 
 		// Spawn field actor
-		FTransform transform;
-		transform.SetLocation(Hit.ImpactPoint);
-		auto field = GetWorld()->SpawnActor<AFieldSystemActor>(CurrentWeapon->GetFieldSystemActor(), transform, SpawnParameters);
+		if (CurrentWeapon->GetFieldSystemActor())
+		{
+			FTransform transform;
+			transform.SetLocation(Hit.ImpactPoint);
+			auto field = GetWorld()->SpawnActor<AFieldSystemActor>(CurrentWeapon->GetFieldSystemActor(), transform, SpawnParameters);
+			
+			if (field)
+			{
+				field->Destroy();
+			}		
+		}
 
 		if (Hit.GetActor())
 		{