diff --git a/src/p_mobj.c b/src/p_mobj.c
index 5026b9c76b..63f2143a84 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1203,10 +1203,10 @@ mobj_t *P_SpawnMapThing(mapthing_t *mthing, const bool spawnmonsters)
         P_SpawnFriend(mthing);
         return NULL;
     }
-    else if (type == PlayerDeathmatchStart)
+    else if ((type >= Player5Start && type <= Player8Start) || type == PlayerDeathmatchStart)
         return NULL;
 
-    if (type == VisualModeCamera)
+    if (type == Nothing || type == VisualModeCamera)
         return NULL;
 
     if (type >= MusicSourceMin && type <= MusicSourceMax)
diff --git a/src/r_defs.h b/src/r_defs.h
index 35f08a5db1..a300a0f556 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -739,6 +739,10 @@ enum
     Zombieman                                          =  3004,
     Cacodemon                                          =  3005,
     LostSoul                                           =  3006,
+    Player5Start                                       =  4001,
+    Player6Start                                       =  4002,
+    Player7Start                                       =  4003,
+    Player8Start                                       =  4004,
     Pusher                                             =  5001,
     Puller                                             =  5002,
     MusicSourceMin                                     = 14100,