diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h
index 86124d1..74a8703 100644
--- a/src/TinyGsmClientXBee.h
+++ b/src/TinyGsmClientXBee.h
@@ -675,6 +675,7 @@ public:
   bool commandMode(int retries = 2) {
     int triesMade = 0;
     bool success = false;
+    streamClear();  // Empty everything in the buffer before starting
     while (!success and triesMade < retries) {
       // Cannot send anything for 1 "guard time" before entering command mode
       // Default guard time is 1s, but the init fxn decreases it to 250 ms