diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 4c7479a09..0b6422ee1 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -8847,6 +8847,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 void P_PostLoadLevel(void)
 {
 	TracyCZone(__zone, true);
+	INT32 i;
 
 	P_MapStart();
 
@@ -8882,6 +8883,20 @@ void P_PostLoadLevel(void)
 		K_UpdateMatchRaceBots();
 	}
 
+	if (roundqueue.snapshotmaps == true)
+	{
+		// Force spectator for snapshotmaps command
+		for (i = 0; i < MAXPLAYERS; i++)
+		{
+			if (!playeringame[i])
+			{
+				continue;
+			}
+
+			players[i].spectator = true;
+		}
+	}
+
 	K_TimerInit();
 
 	P_InitPlayers();
@@ -8905,7 +8920,6 @@ void P_PostLoadLevel(void)
 	ACS_RunLevelStartScripts();
 	LUA_HookInt(gamemap, HOOK(MapLoad));
 
-	UINT8 i;
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i])
diff --git a/src/r_things.cpp b/src/r_things.cpp
index c61c52124..918db5f02 100644
--- a/src/r_things.cpp
+++ b/src/r_things.cpp
@@ -3796,6 +3796,7 @@ boolean R_ThingVisible (mobj_t *thing)
 			case MT_BATTLECAPSULE:
 			case MT_BATTLECAPSULE_PIECE:
 			case MT_SPRAYCAN:
+			case MT_PLAYER:
 				return false;
 
 			default: