diff --git a/Server/API/AgentUpdateController.cs b/Server/API/AgentUpdateController.cs
index 6f22d544..1d40d685 100644
--- a/Server/API/AgentUpdateController.cs
+++ b/Server/API/AgentUpdateController.cs
@@ -56,13 +56,14 @@ namespace Remotely.Server.API
                     _downloadingAgents.TryGetValue(string.Empty, out _);
                 }
 
-                var expirationTimespan = TimeSpan.FromMinutes(10);
+                var entryExpirationTime = TimeSpan.FromMinutes(6);
+                var tokenExpirationTime = entryExpirationTime.Add(TimeSpan.FromSeconds(15));
 
                 var expirationToken = new CancellationChangeToken(
-                    new CancellationTokenSource(expirationTimespan).Token);
+                    new CancellationTokenSource(tokenExpirationTime).Token);
 
                 var cacheOptions = new MemoryCacheEntryOptions()
-                    .SetAbsoluteExpiration(expirationTimespan)
+                    .SetAbsoluteExpiration(entryExpirationTime)
                     .AddExpirationToken(expirationToken);
 
                 _downloadingAgents.Set(downloadId, string.Empty, cacheOptions);