diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py
index b30796ee..73017dec 100644
--- a/src/octoprint/util/comm.py
+++ b/src/octoprint/util/comm.py
@@ -869,7 +869,7 @@ class MachineCom(object):
 						continue
 
 				##~~ process oks
-				if line.strip().startswith("ok") or (supportWait and line.strip().startswith("wait")):
+				if line.strip().startswith("ok") or (self.isPrinting() and supportWait and line.strip().startswith("wait")):
 					self._clear_to_send.set()
 					self._blocking_command = False