diff --git a/Duplicati/Library/RemoteControl/KeepRemoteConnection.cs b/Duplicati/Library/RemoteControl/KeepRemoteConnection.cs
index 74e3dba13..1018f3264 100644
--- a/Duplicati/Library/RemoteControl/KeepRemoteConnection.cs
+++ b/Duplicati/Library/RemoteControl/KeepRemoteConnection.cs
@@ -46,6 +46,11 @@ public class KeepRemoteConnection : IDisposable
     /// </summary>
     private static readonly TimeSpan ReconnectInterval = TimeSpan.FromSeconds(30);
 
+    /// <summary>
+    /// The interval between reconnect attempts
+    /// </summary>
+    private static readonly TimeSpan NoResponseTimeout = TimeSpan.FromSeconds(30);
+
     /// <summary>
     /// The interval between heartbeats
     /// </summary>
@@ -179,9 +184,8 @@ public class KeepRemoteConnection : IDisposable
     /// </summary>
     private Task RunMainLoop()
     {
-        //TODO: If we close the socket, it reconnects immediately
-        // casuing excessive usage
-        _client.ReconnectTimeout = ReconnectInterval;
+        _client.ReconnectTimeout = NoResponseTimeout;
+        _client.LostReconnectTimeout = ReconnectInterval;
         _client.IsReconnectionEnabled = true;
 
         _client.DisconnectionHappened.Subscribe(info =>