diff --git a/bCNC/controllers/GRBL1.py b/bCNC/controllers/GRBL1.py
index 76b063259..bddef321f 100644
--- a/bCNC/controllers/GRBL1.py
+++ b/bCNC/controllers/GRBL1.py
@@ -216,10 +216,11 @@ def parseBracketAngle(self, line, cline):
                     break
 
         # Machine is Idle buffer is empty stop waiting and go on
+        main_state = fields[0].split(":")[0]
         if (
             self.master.sio_wait
             and not cline
-            and fields[0] not in ("Run", "Jog", "Hold")
+            and main_state not in ("Run", "Jog", "Hold")
         ):
             self.master.sio_wait = False
             self.master._gcount += 1