diff --git a/src/kOS/AddOns/RemoteTech/RemoteTechConnectivityManager.cs b/src/kOS/AddOns/RemoteTech/RemoteTechConnectivityManager.cs
index 842d767b9f..72753bbe55 100644
--- a/src/kOS/AddOns/RemoteTech/RemoteTechConnectivityManager.cs
+++ b/src/kOS/AddOns/RemoteTech/RemoteTechConnectivityManager.cs
@@ -42,6 +42,11 @@ public double GetDelay(Vessel vessel1, Vessel vessel2)
             if (!(RemoteTechHook.IsAvailable()))
                 return -1; // default to no connection if RT itself isn't available.
             double delay = RemoteTechHook.Instance.GetSignalDelayToSatellite(vessel1.id, vessel2.id);
+            if (Double.IsPositiveInfinity(delay) || delay < 0)
+            {
+                delay = Math.Max(RemoteTechHook.Instance.GetShortestSignalDelay(vessel1.id), 
+                                RemoteTechHook.Instance.GetShortestSignalDelay(vessel2.id));
+            }
             return Double.IsPositiveInfinity(delay) ? -1 : delay;
         }