diff --git a/libraries/AP_HAL_Linux/UARTDriver.cpp b/libraries/AP_HAL_Linux/UARTDriver.cpp
index 67da8a771b..b9ee6df359 100644
--- a/libraries/AP_HAL_Linux/UARTDriver.cpp
+++ b/libraries/AP_HAL_Linux/UARTDriver.cpp
@@ -77,7 +77,11 @@ void LinuxUARTDriver::begin(uint32_t b, uint16_t rxS, uint16_t txS)
             {
                 _connected = false;
                 if (_flag != NULL){
-                    _tcp_start_connection(true);    
+                    if (!strcmp(_flag, "wait")){    
+                        _tcp_start_connection(true);    
+                    } else {
+                        _tcp_start_connection(false);    
+                    }
                 } else {
                     _tcp_start_connection(false);    
                 }