diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 0f5ca28a50..3d83c78fcb 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -250,7 +250,11 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 		SS_INIT_NO_NEED,
 	)
 
-	if (subsystem.flags & SS_NO_INIT || subsystem.subsystem_initialized) //Don't init SSs with the corresponding flag or if they already are initialized
+	if (subsystem.subsystem_initialized) //Don't init if they already are initialized
+		return
+
+	if (subsystem.flags & SS_NO_INIT)
+		subsystem.subsystem_initialized = TRUE
 		return
 
 	current_initializing_subsystem = subsystem