diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 6cfd051727..997e0fd3e0 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -385,7 +385,7 @@ var/datum/controller/master/Master = new()
 		if (SS_flags & SS_NO_FIRE)
 			subsystemstocheck -= SS
 			continue
-		if (!(SS_flags & SS_TICKER) && (SS_flags & SS_KEEP_TIMING) && SS.last_fire + (SS.wait * 0.75) > world.time)
+		if ((SS_flags & (SS_TICKER|SS_KEEP_TIMING)) == SS_KEEP_TIMING && SS.last_fire + (SS.wait * 0.75) > world.time)
 			continue
 		SS.enqueue()
 	. = 1