diff --git a/Source/gs-entbase/server/baseentity.cpp b/Source/gs-entbase/server/baseentity.cpp
index aefc68c6..67757a29 100644
--- a/Source/gs-entbase/server/baseentity.cpp
+++ b/Source/gs-entbase/server/baseentity.cpp
@@ -36,6 +36,14 @@ class CBaseEntity
 
 void CBaseEntity :: CBaseEntity ( void )
 {
+	/* Not in Deathmatch */
+	if (spawnflags & 2048) {
+		if (cvar("sv_playerslots") > 1) {
+			remove(this);
+			return;
+		}
+	}
+
 	gflags |= GF_CANRESPAWN;
 	m_oldModel = Util_FixModel(model);
 	m_oldSolid = solid;