diff --git a/RGB.NET.Core/Devices/AbstractRGBDevice.cs b/RGB.NET.Core/Devices/AbstractRGBDevice.cs
index faaf147..596625c 100644
--- a/RGB.NET.Core/Devices/AbstractRGBDevice.cs
+++ b/RGB.NET.Core/Devices/AbstractRGBDevice.cs
@@ -162,7 +162,8 @@ public abstract class AbstractRGBDevice<TDeviceInfo> : Placeable, IRGBDevice<TDe
         try
         {
             UpdateQueue.RemoveReferencingObject(this);
-            UpdateQueue.Dispose();
+            if (!UpdateQueue.HasActiveReferences())
+                UpdateQueue.Dispose();
         }
         catch { /* :( */ }
         try { LedMapping.Clear(); } catch { /* this really shouldn't happen */ }
diff --git a/RGB.NET.Core/Update/Devices/UpdateQueue.cs b/RGB.NET.Core/Update/Devices/UpdateQueue.cs
index bdd0868..72cec7e 100644
--- a/RGB.NET.Core/Update/Devices/UpdateQueue.cs
+++ b/RGB.NET.Core/Update/Devices/UpdateQueue.cs
@@ -112,14 +112,8 @@ public abstract class UpdateQueue<TIdentifier, TData> : AbstractReferenceCountin
     }
 
     /// <inheritdoc />
-    /// <summary>
-    /// Disposes this queue.
-    /// Checks if any referencing objects are registered and if so, will return without disposing!
-    /// </summary>
     public virtual void Dispose()
     {
-        if (this.HasActiveReferences()) return;
-
         _updateTrigger.Starting -= OnStartup;
         _updateTrigger.Update -= OnUpdate;