diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 53457200d..ef5abb8e0 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -2464,7 +2464,7 @@ void P_NightmareRespawn (AActor *mobj)
 	// spawn it
 	x = mobj->SpawnPoint[0];
 	y = mobj->SpawnPoint[1];
-	mo = Spawn (RUNTIME_TYPE(mobj), x, y, z, NO_REPLACE);
+	mo = AActor::StaticSpawn(RUNTIME_TYPE(mobj), x, y, z, NO_REPLACE, true);
 
 	if (z == ONFLOORZ)
 		mo->z += mo->SpawnPoint[2];
@@ -3354,8 +3354,8 @@ void AActor::Tick ()
 		if (level.time & 31)
 			return;
 
-		if (pr_nightmarerespawn() > 4)
-			return;
+//		if (pr_nightmarerespawn() > 4)
+//			return;
 
 		P_NightmareRespawn (this);
 	}