diff --git a/LightlessSync/Utils/TaskRegistry.cs b/LightlessSync/Utils/TaskRegistry.cs
index 90b6fcf..7104548 100644
--- a/LightlessSync/Utils/TaskRegistry.cs
+++ b/LightlessSync/Utils/TaskRegistry.cs
@@ -31,34 +31,26 @@ public sealed class TaskRegistry<HandleType> where HandleType : notnull
 
     private Task GetOrStartInternal(HandleType handle, Func<Task> taskFactory)
     {
-        while (true)
+        Lazy<Task> entry = _activeTasks.GetOrAdd(handle, _ => CreateEntry(handle, taskFactory));
+        Task task = entry.Value;
+        if (task.IsCompleted)
         {
-            Lazy<Task> entry = _activeTasks.GetOrAdd(handle, _ => CreateEntry(handle, taskFactory));
-            Task task = entry.Value;
-
-            if (!task.IsCompleted)
-            {
-                return task;
-            }
-
             _activeTasks.TryRemove(new KeyValuePair<HandleType, Lazy<Task>>(handle, entry));
         }
+
+        return task;
     }
 
     private Task<T> GetOrStartInternal<T>(HandleType handle, Func<Task<T>> taskFactory)
     {
-        while (true)
+        Lazy<Task> entry = _activeTasks.GetOrAdd(handle, _ => CreateEntry(handle, taskFactory));
+        Task task = entry.Value;
+        if (task.IsCompleted)
         {
-            Lazy<Task> entry = _activeTasks.GetOrAdd(handle, _ => CreateEntry(handle, taskFactory));
-            Task task = entry.Value;
-
-            if (!task.IsCompleted)
-            {
-                return (Task<T>)task;
-            }
-
             _activeTasks.TryRemove(new KeyValuePair<HandleType, Lazy<Task>>(handle, entry));
         }
+
+        return (Task<T>)task;
     }
 
     private Lazy<Task> CreateEntry(HandleType handle, Func<Task> taskFactory)