diff --git a/src/p_user.cpp b/src/p_user.cpp
index 0617e5d6a..0d5cdce20 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -1562,12 +1562,15 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SkullPop)
 	if (player != NULL)
 	{
 		player->mo = mo;
-		if (player->camera == self)
-		{
-			player->camera = mo;
-		}
 		player->damagecount = 32;
 	}
+	for (int i = 0; i < MAXPLAYERS; ++i)
+	{
+		if (playeringame[i] && players[i].camera == self)
+		{
+			players[i].camera = mo;
+		}
+	}
 }
 
 //----------------------------------------------------------------------------