diff --git a/events/StartGameEvent.py b/events/StartGameEvent.py
index 7886827..45aa1d8 100644
--- a/events/StartGameEvent.py
+++ b/events/StartGameEvent.py
@@ -32,10 +32,14 @@ class StartGameEvent(Event):
 
         super().trigger(target)
 
+        if self.timer is None:
+            PLAYER_LAMPS.deactivate()
+            PLAYER_LAMPS.activateNext()
+            return
+
         self.restart_timer()
 
         if self.playerCount == config.MAX_PLAYERS:
-            PLAYER_LAMPS.deactivate()
             PLAYER_LAMPS.activateNext()
             self.playerCount = 1
             return
diff --git a/factories/DisplayFactory.py b/factories/DisplayFactory.py
index 3b44512..08ec212 100644
--- a/factories/DisplayFactory.py
+++ b/factories/DisplayFactory.py
@@ -8,10 +8,12 @@ class DisplayFactory:
 
     def createDisplays(self):
         displays = [None] * config.MAX_PLAYERS
+
         for display in self.displayNames:
             if "Player" in display['name']:
                 id = int(display['name'].replace("Player_", "")) - 1
                 displays[id] = PlayerDisplay(display['name'])
+
         return displays
 
     def createSpecialDisplay(self):