diff --git a/Application/ApplicationManager.cs b/Application/ApplicationManager.cs
index 60455d50b..1a8e23b94 100644
--- a/Application/ApplicationManager.cs
+++ b/Application/ApplicationManager.cs
@@ -240,7 +240,7 @@ namespace IW4MAdmin.Application
                 }
 
                 // remove the update tasks as they have completed
-                foreach (var serverId in serverTasksToRemove)
+                foreach (var serverId in serverTasksToRemove.Where(serverId => runningUpdateTasks.ContainsKey(serverId)))
                 {
                     if (!runningUpdateTasks[serverId].tokenSource.Token.IsCancellationRequested)
                     {