diff --git a/cpp/src/Driver.cpp b/cpp/src/Driver.cpp
index 7a31b5952a..2f005b2c19 100644
--- a/cpp/src/Driver.cpp
+++ b/cpp/src/Driver.cpp
@@ -1723,7 +1723,8 @@ bool Driver::ReadMsg()
 				Log::Write(LogLevel_Warning, "m_currentMsg was NULL when trying to set MaxSendAttempts");
 				Log::QueueDump();
 			}
-			WriteMsg("CAN");
+			// Don't do WriteMsg("CAN"); here, the controller has data waiting to be handled by OZW.
+			// Instead, let the main loop handle incoming message first to flush the buffer(s)
 			break;
 		}