diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 0bf717870a3d045af099ac59f15c419448fb8a2c..d983ceca42d2ef49bdadff05790dbd0313fe2b5b 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -2066,6 +2066,11 @@ void Vehicle::setConnectionLostEnabled(bool connectionLostEnabled)
 
 void Vehicle::_connectionLostTimeout(void)
 {
+    if (highLatencyLink()) {
+        // No connection timeout on high latency links
+        return;
+    }
+
     if (_connectionLostEnabled && !_connectionLost) {
         _connectionLost = true;
         _heardFrom = false;