diff --git a/src/g_level.cpp b/src/g_level.cpp
index 5997e489eed..207a3682abf 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1045,6 +1045,16 @@ void G_DoLoadLevel (int position, bool autosave)
 
 	G_UnSnapshotLevel (!savegamerestore);	// [RH] Restore the state of the level.
 	int pnumerr = G_FinishTravel ();
+
+	if (!level.FromSnapshot)
+	{
+		for (int i = 0; i<MAXPLAYERS; i++)
+		{
+			if (playeringame[i] && players[i].mo != NULL)
+				P_PlayerStartStomp(players[i].mo);
+		}
+	}
+
 	// For each player, if they are viewing through a player, make sure it is themselves.
 	for (int ii = 0; ii < MAXPLAYERS; ++ii)
 	{
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 893547bfb1d..db5baf51869 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -1845,11 +1845,6 @@ void P_SpawnThings (int position)
 			SetMapThingUserData(actor, *udi);
 		}
 	}
-	for(int i=0; i<MAXPLAYERS; i++)
-	{
-		if (playeringame[i] && players[i].mo != NULL)
-			P_PlayerStartStomp(players[i].mo);
-	}
 }