diff --git a/RGB.NET.Core/Devices/AbstractRGBDevice.cs b/RGB.NET.Core/Devices/AbstractRGBDevice.cs
index 2ed8377..a737f29 100644
--- a/RGB.NET.Core/Devices/AbstractRGBDevice.cs
+++ b/RGB.NET.Core/Devices/AbstractRGBDevice.cs
@@ -157,8 +157,12 @@ namespace RGB.NET.Core
         /// <inheritdoc />
         public virtual void Dispose()
         {
-            SpecialDeviceParts.Clear();
-            LedMapping.Clear();
+            try
+            {
+                SpecialDeviceParts.Clear();
+                LedMapping.Clear();
+            }
+            catch { /* this really shouldn't happen */ }
         }
 
         /// <summary>
diff --git a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs
index f8e3834..cf19d8c 100644
--- a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs
+++ b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs
@@ -172,7 +172,12 @@ namespace RGB.NET.Devices.Asus
         /// <inheritdoc />
         public void Dispose()
         {
-            _sdk?.ReleaseControl(0);
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            try { _sdk?.ReleaseControl(0); }
+            catch { /* at least we tried */ }
+
             _sdk = null;
         }
 
diff --git a/RGB.NET.Devices.Asus/Generic/AsusRGBDevice.cs b/RGB.NET.Devices.Asus/Generic/AsusRGBDevice.cs
index 0241828..42caff9 100644
--- a/RGB.NET.Devices.Asus/Generic/AsusRGBDevice.cs
+++ b/RGB.NET.Devices.Asus/Generic/AsusRGBDevice.cs
@@ -80,6 +80,15 @@ namespace RGB.NET.Devices.Asus
             //}
         }
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.Asus_Legacy/AsusDeviceProvider.cs b/RGB.NET.Devices.Asus_Legacy/AsusDeviceProvider.cs
index 946125d..6dbae09 100644
--- a/RGB.NET.Devices.Asus_Legacy/AsusDeviceProvider.cs
+++ b/RGB.NET.Devices.Asus_Legacy/AsusDeviceProvider.cs
@@ -268,6 +268,9 @@ namespace RGB.NET.Devices.Asus
         /// <inheritdoc />
         public void Dispose()
         {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
             try { _AsusSDK.UnloadAsusSDK(); }
             catch { /* at least we tried */ }
         }
diff --git a/RGB.NET.Devices.Asus_Legacy/Generic/AsusRGBDevice.cs b/RGB.NET.Devices.Asus_Legacy/Generic/AsusRGBDevice.cs
index 083cafd..011383b 100644
--- a/RGB.NET.Devices.Asus_Legacy/Generic/AsusRGBDevice.cs
+++ b/RGB.NET.Devices.Asus_Legacy/Generic/AsusRGBDevice.cs
@@ -80,6 +80,9 @@ namespace RGB.NET.Devices.Asus
         /// <inheritdoc cref="AbstractRGBDevice{TDeviceInfo}.Dispose" />
         public override void Dispose()
         {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
             if ((DeviceInfo is AsusRGBDeviceInfo deviceInfo) && (deviceInfo.Handle != IntPtr.Zero))
                 Marshal.FreeHGlobal(deviceInfo.Handle);
 
diff --git a/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs b/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
index e676ca1..0e4b6c0 100644
--- a/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
+++ b/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
@@ -175,6 +175,9 @@ namespace RGB.NET.Devices.CoolerMaster
         /// <inheritdoc />
         public void Dispose()
         {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
             if (IsInitialized)
                 foreach (IRGBDevice device in Devices)
                 {
diff --git a/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs b/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs
index c35676e..d33351f 100644
--- a/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs
+++ b/RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs
@@ -74,6 +74,9 @@ namespace RGB.NET.Devices.CoolerMaster
         /// <inheritdoc cref="AbstractRGBDevice{TDeviceInfo}.Dispose" />
         public override void Dispose()
         {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
             _CoolerMasterSDK.EnableLedControl(false, DeviceInfo.DeviceIndex);
 
             base.Dispose();
diff --git a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
index 330be29..166662d 100644
--- a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
+++ b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
@@ -293,6 +293,9 @@ namespace RGB.NET.Devices.Corsair
         /// <inheritdoc />
         public void Dispose()
         {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
             try { _CUESDK.UnloadCUESDK(); }
             catch { /* at least we tried */ }
         }
diff --git a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
index bb0c479..650a61e 100644
--- a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
@@ -122,6 +122,15 @@ namespace RGB.NET.Devices.Corsair
             Marshal.FreeHGlobal(ptr);
         }
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { DeviceUpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.DMX/DMXDeviceProvider.cs b/RGB.NET.Devices.DMX/DMXDeviceProvider.cs
index 3e7d889..a151778 100644
--- a/RGB.NET.Devices.DMX/DMXDeviceProvider.cs
+++ b/RGB.NET.Devices.DMX/DMXDeviceProvider.cs
@@ -116,7 +116,10 @@ namespace RGB.NET.Devices.DMX
 
         /// <inheritdoc />
         public void Dispose()
-        { }
+        {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+        }
 
         #endregion
     }
diff --git a/RGB.NET.Devices.DMX/E131/E131Device.cs b/RGB.NET.Devices.DMX/E131/E131Device.cs
index 871466e..1b199dd 100644
--- a/RGB.NET.Devices.DMX/E131/E131Device.cs
+++ b/RGB.NET.Devices.DMX/E131/E131Device.cs
@@ -59,6 +59,15 @@ namespace RGB.NET.Devices.DMX.E131
         /// <inheritdoc />
         protected override void UpdateLeds(IEnumerable<Led> ledsToUpdate) => _updateQueue.SetData(ledsToUpdate.Where(x => x.Color.A > 0));
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { _updateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs b/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
index 02a8373..74104fa 100644
--- a/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
+++ b/RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
@@ -70,6 +70,15 @@ namespace RGB.NET.Devices.Logitech
             ApplyLayoutFromFile(PathHelper.GetAbsolutePath(this, @"Layouts\Logitech", $"{layoutPath}.xml"), layout, true);
         }
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs b/RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs
index eaab179..5169eb3 100644
--- a/RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs
+++ b/RGB.NET.Devices.Logitech/LogitechDeviceProvider.cs
@@ -184,6 +184,9 @@ namespace RGB.NET.Devices.Logitech
         /// <inheritdoc />
         public void Dispose()
         {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
             try { _LogitechGSDK.LogiLedRestoreLighting(); }
             catch { /* at least we tried */ }
 
diff --git a/RGB.NET.Devices.Msi/Generic/MsiRGBDevice.cs b/RGB.NET.Devices.Msi/Generic/MsiRGBDevice.cs
index e6a5210..258bf84 100644
--- a/RGB.NET.Devices.Msi/Generic/MsiRGBDevice.cs
+++ b/RGB.NET.Devices.Msi/Generic/MsiRGBDevice.cs
@@ -68,6 +68,15 @@ namespace RGB.NET.Devices.Msi
         protected override void UpdateLeds(IEnumerable<Led> ledsToUpdate)
             => DeviceUpdateQueue.SetData(ledsToUpdate.Where(x => (x.Color.A > 0) && (x.CustomData is int)));
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { DeviceUpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.Msi/MsiDeviceProvider.cs b/RGB.NET.Devices.Msi/MsiDeviceProvider.cs
index f5bf830..dc46a01 100644
--- a/RGB.NET.Devices.Msi/MsiDeviceProvider.cs
+++ b/RGB.NET.Devices.Msi/MsiDeviceProvider.cs
@@ -164,6 +164,9 @@ namespace RGB.NET.Devices.Msi
         /// <inheritdoc />
         public void Dispose()
         {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
             try { _MsiSDK.UnloadMsiSDK(); }
             catch { /* at least we tried */ }
         }
diff --git a/RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs b/RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs
index c1904eb..8152ebe 100644
--- a/RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs
+++ b/RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs
@@ -78,8 +78,11 @@ namespace RGB.NET.Devices.Novation
         /// <inheritdoc cref="AbstractRGBDevice{TDeviceInfo}.Dispose" />
         public override void Dispose()
         {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
             Reset();
-            UpdateQueue.Dispose();
+
             base.Dispose();
         }
 
diff --git a/RGB.NET.Devices.Novation/NovationDeviceProvider.cs b/RGB.NET.Devices.Novation/NovationDeviceProvider.cs
index 5ad614f..b7890e8 100644
--- a/RGB.NET.Devices.Novation/NovationDeviceProvider.cs
+++ b/RGB.NET.Devices.Novation/NovationDeviceProvider.cs
@@ -122,7 +122,10 @@ namespace RGB.NET.Devices.Novation
 
         /// <inheritdoc />
         public void Dispose()
-        { }
+        {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+        }
 
         #endregion
     }
diff --git a/RGB.NET.Devices.Razer/Generic/RazerRGBDevice.cs b/RGB.NET.Devices.Razer/Generic/RazerRGBDevice.cs
index 525dd58..e537caf 100644
--- a/RGB.NET.Devices.Razer/Generic/RazerRGBDevice.cs
+++ b/RGB.NET.Devices.Razer/Generic/RazerRGBDevice.cs
@@ -81,6 +81,15 @@ namespace RGB.NET.Devices.Razer
         /// </summary>
         public void Reset() => UpdateQueue.Reset();
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.Razer/RazerDeviceProvider.cs b/RGB.NET.Devices.Razer/RazerDeviceProvider.cs
index 2172491..0f711bb 100644
--- a/RGB.NET.Devices.Razer/RazerDeviceProvider.cs
+++ b/RGB.NET.Devices.Razer/RazerDeviceProvider.cs
@@ -224,6 +224,9 @@ namespace RGB.NET.Devices.Razer
         /// <inheritdoc />
         public void Dispose()
         {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
             TryUnInit();
 
             try { _RazerSDK.UnloadRazerSDK(); }
diff --git a/RGB.NET.Devices.SoIP/Server/SoIPServerRGBDevice.cs b/RGB.NET.Devices.SoIP/Server/SoIPServerRGBDevice.cs
index 5a5285e..ca72447 100644
--- a/RGB.NET.Devices.SoIP/Server/SoIPServerRGBDevice.cs
+++ b/RGB.NET.Devices.SoIP/Server/SoIPServerRGBDevice.cs
@@ -66,6 +66,9 @@ namespace RGB.NET.Devices.SoIP.Server
         /// <inheritdoc />
         public override void Dispose()
         {
+            try { _updateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
             base.Dispose();
 
             _tcpServer.Stop();
diff --git a/RGB.NET.Devices.SoIP/SoIPDeviceProvider.cs b/RGB.NET.Devices.SoIP/SoIPDeviceProvider.cs
index 9152b9a..9755cc2 100644
--- a/RGB.NET.Devices.SoIP/SoIPDeviceProvider.cs
+++ b/RGB.NET.Devices.SoIP/SoIPDeviceProvider.cs
@@ -56,7 +56,7 @@ namespace RGB.NET.Devices.SoIP
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(SoIPDeviceProvider)}");
             _instance = this;
-            
+
             UpdateTrigger = new DeviceUpdateTrigger();
         }
 
@@ -130,8 +130,8 @@ namespace RGB.NET.Devices.SoIP
         /// <inheritdoc />
         public void Dispose()
         {
-            foreach (IRGBDevice device in Devices)
-                device.Dispose();
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
         }
 
         #endregion
diff --git a/RGB.NET.Devices.SteelSeries/Generic/SteelSeriesRGBDevice.cs b/RGB.NET.Devices.SteelSeries/Generic/SteelSeriesRGBDevice.cs
index f13d918..78a65eb 100644
--- a/RGB.NET.Devices.SteelSeries/Generic/SteelSeriesRGBDevice.cs
+++ b/RGB.NET.Devices.SteelSeries/Generic/SteelSeriesRGBDevice.cs
@@ -83,6 +83,15 @@ namespace RGB.NET.Devices.SteelSeries
             ApplyLayoutFromFile(PathHelper.GetAbsolutePath(this, @"Layouts\SteelSeries", $"{layoutPath}.xml"), layout, true);
         }
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.SteelSeries/SteelSeriesDeviceProvider.cs b/RGB.NET.Devices.SteelSeries/SteelSeriesDeviceProvider.cs
index 9f59d7d..21402dd 100644
--- a/RGB.NET.Devices.SteelSeries/SteelSeriesDeviceProvider.cs
+++ b/RGB.NET.Devices.SteelSeries/SteelSeriesDeviceProvider.cs
@@ -117,11 +117,11 @@ namespace RGB.NET.Devices.SteelSeries
         /// <inheritdoc />
         public void Dispose()
         {
-            try
-            {
-                SteelSeriesSDK.Dispose();
-            }
-            catch {/* shit happens */}
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            try { SteelSeriesSDK.Dispose(); }
+            catch { /* shit happens */ }
         }
 
         #endregion
diff --git a/RGB.NET.Devices.WS281X/Arduino/ArduinoWS2812USBDevice.cs b/RGB.NET.Devices.WS281X/Arduino/ArduinoWS2812USBDevice.cs
index 5fa3c85..f8b9d4f 100644
--- a/RGB.NET.Devices.WS281X/Arduino/ArduinoWS2812USBDevice.cs
+++ b/RGB.NET.Devices.WS281X/Arduino/ArduinoWS2812USBDevice.cs
@@ -73,6 +73,15 @@ namespace RGB.NET.Devices.WS281X.Arduino
         /// <inheritdoc />
         protected override void UpdateLeds(IEnumerable<Led> ledsToUpdate) => UpdateQueue.SetData(ledsToUpdate.Where(x => x.Color.A > 0));
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.WS281X/Arduino/ArduinoWS281XDeviceDefinition.cs b/RGB.NET.Devices.WS281X/Arduino/ArduinoWS281XDeviceDefinition.cs
index dc28760..0690926 100644
--- a/RGB.NET.Devices.WS281X/Arduino/ArduinoWS281XDeviceDefinition.cs
+++ b/RGB.NET.Devices.WS281X/Arduino/ArduinoWS281XDeviceDefinition.cs
@@ -39,7 +39,7 @@ namespace RGB.NET.Devices.WS281X.Arduino
         /// <summary>
         /// Initializes a new instance of the <see cref="ArduinoWS281XDeviceDefinition"/> class.
         /// </summary>
-        /// <param name="portName">The name of the serial-port to connect to.</param>
+        /// <param name="port">The name of the serial-port to connect to.</param>
         public ArduinoWS281XDeviceDefinition(string port)
         {
             this.Port = port;
@@ -50,10 +50,8 @@ namespace RGB.NET.Devices.WS281X.Arduino
         #region Methods
 
         /// <inheritdoc />
-        public IEnumerable<IRGBDevice> CreateDevices()
+        public IEnumerable<IRGBDevice> CreateDevices(IDeviceUpdateTrigger updateTrigger)
         {
-            DeviceUpdateTrigger updateTrigger = new DeviceUpdateTrigger();
-
             ArduinoWS2812USBUpdateQueue queue = new ArduinoWS2812USBUpdateQueue(updateTrigger, Port, BaudRate);
             IEnumerable<(int channel, int ledCount)> channels = queue.GetChannels();
             int counter = 0;
@@ -64,8 +62,6 @@ namespace RGB.NET.Devices.WS281X.Arduino
                 device.Initialize(ledCount);
                 yield return device;
             }
-
-            updateTrigger.Start();
         }
 
         #endregion
diff --git a/RGB.NET.Devices.WS281X/Bitwizard/BitwizardWS2812USBDevice.cs b/RGB.NET.Devices.WS281X/Bitwizard/BitwizardWS2812USBDevice.cs
index 0e4f7a9..74d52ee 100644
--- a/RGB.NET.Devices.WS281X/Bitwizard/BitwizardWS2812USBDevice.cs
+++ b/RGB.NET.Devices.WS281X/Bitwizard/BitwizardWS2812USBDevice.cs
@@ -63,6 +63,15 @@ namespace RGB.NET.Devices.WS281X.Bitwizard
         /// <inheritdoc />
         protected override void UpdateLeds(IEnumerable<Led> ledsToUpdate) => UpdateQueue.SetData(ledsToUpdate.Where(x => x.Color.A > 0));
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.WS281X/Bitwizard/BitwizardWS281XDeviceDefinition.cs b/RGB.NET.Devices.WS281X/Bitwizard/BitwizardWS281XDeviceDefinition.cs
index d8bc4f3..b769519 100644
--- a/RGB.NET.Devices.WS281X/Bitwizard/BitwizardWS281XDeviceDefinition.cs
+++ b/RGB.NET.Devices.WS281X/Bitwizard/BitwizardWS281XDeviceDefinition.cs
@@ -43,7 +43,7 @@ namespace RGB.NET.Devices.WS281X.Bitwizard
         /// <summary>
         /// Initializes a new instance of the <see cref="BitwizardWS281XDeviceDefinition"/> class.
         /// </summary>
-        /// <param name="portName">The name of the serial-port to connect to.</param>
+        /// <param name="port">The name of the serial-port to connect to.</param>
         public BitwizardWS281XDeviceDefinition(string port)
         {
             this.Port = port;
@@ -54,17 +54,13 @@ namespace RGB.NET.Devices.WS281X.Bitwizard
         #region Methods
 
         /// <inheritdoc />
-        public IEnumerable<IRGBDevice> CreateDevices()
+        public IEnumerable<IRGBDevice> CreateDevices(IDeviceUpdateTrigger updateTrigger)
         {
-            DeviceUpdateTrigger updateTrigger = new DeviceUpdateTrigger();
-
             BitwizardWS2812USBUpdateQueue queue = new BitwizardWS2812USBUpdateQueue(updateTrigger, Port, BaudRate);
             string name = Name ?? $"Bitwizard WS2812 USB ({Port})";
             BitwizardWS2812USBDevice device = new BitwizardWS2812USBDevice(new BitwizardWS2812USBDeviceInfo(name), queue);
             device.Initialize(StripLength);
             yield return device;
-
-            updateTrigger.Start();
         }
 
         #endregion
diff --git a/RGB.NET.Devices.WS281X/Generic/IWS281XDeviceDefinition.cs b/RGB.NET.Devices.WS281X/Generic/IWS281XDeviceDefinition.cs
index 8ff5fa9..a6f375e 100644
--- a/RGB.NET.Devices.WS281X/Generic/IWS281XDeviceDefinition.cs
+++ b/RGB.NET.Devices.WS281X/Generic/IWS281XDeviceDefinition.cs
@@ -13,6 +13,6 @@ namespace RGB.NET.Devices.WS281X
         /// Gets the devices defined by this definition.
         /// </summary>
         /// <returns>The initialized devices defined by this definition.</returns>
-        IEnumerable<IRGBDevice> CreateDevices();
+        IEnumerable<IRGBDevice> CreateDevices(IDeviceUpdateTrigger updateTrigger);
     }
 }
diff --git a/RGB.NET.Devices.WS281X/WS281XDeviceProvider.cs b/RGB.NET.Devices.WS281X/WS281XDeviceProvider.cs
index 127e54b..89ad1cc 100644
--- a/RGB.NET.Devices.WS281X/WS281XDeviceProvider.cs
+++ b/RGB.NET.Devices.WS281X/WS281XDeviceProvider.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using RGB.NET.Core;
 
 namespace RGB.NET.Devices.WS281X
@@ -37,6 +38,11 @@ namespace RGB.NET.Devices.WS281X
         // ReSharper disable once ReturnTypeCanBeEnumerable.Global
         public List<IWS281XDeviceDefinition> DeviceDefinitions { get; } = new List<IWS281XDeviceDefinition>();
 
+        /// <summary>
+        /// The <see cref="DeviceUpdateTrigger"/> used to trigger the updates for corsair devices. 
+        /// </summary>
+        public DeviceUpdateTrigger UpdateTrigger { get; }
+
         #endregion
 
         #region Constructors
@@ -49,6 +55,8 @@ namespace RGB.NET.Devices.WS281X
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(WS281XDeviceProvider)}");
             _instance = this;
+
+            UpdateTrigger = new DeviceUpdateTrigger();
         }
 
         #endregion
@@ -69,17 +77,20 @@ namespace RGB.NET.Devices.WS281X
 
             try
             {
+                UpdateTrigger?.Stop();
+
                 List<IRGBDevice> devices = new List<IRGBDevice>();
                 foreach (IWS281XDeviceDefinition deviceDefinition in DeviceDefinitions)
                 {
                     try
                     {
-                        devices.AddRange(deviceDefinition.CreateDevices());
+                        devices.AddRange(deviceDefinition.CreateDevices(UpdateTrigger));
                     }
                     catch { if (throwExceptions) throw; }
                 }
-                Devices = devices;
+                UpdateTrigger?.Start();
 
+                Devices = new ReadOnlyCollection<IRGBDevice>(devices);
                 IsInitialized = true;
             }
             catch
@@ -99,10 +110,10 @@ namespace RGB.NET.Devices.WS281X
         /// <inheritdoc />
         public void Dispose()
         {
-            if (IsInitialized)
-                foreach (IRGBDevice device in Devices)
-                    if (device is IDisposable disposable)
-                        disposable.Dispose();
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */}
+
+            DeviceDefinitions.Clear();
         }
 
         #endregion
diff --git a/RGB.NET.Devices.Wooting/Generic/WootingRGBDevice.cs b/RGB.NET.Devices.Wooting/Generic/WootingRGBDevice.cs
index 7647a3d..b766da8 100644
--- a/RGB.NET.Devices.Wooting/Generic/WootingRGBDevice.cs
+++ b/RGB.NET.Devices.Wooting/Generic/WootingRGBDevice.cs
@@ -63,6 +63,15 @@ namespace RGB.NET.Devices.Wooting.Generic
         /// </summary>
         protected abstract void InitializeLayout();
 
+        /// <inheritdoc />
+        public override void Dispose()
+        {
+            try { UpdateQueue?.Dispose(); }
+            catch { /* at least we tried */ }
+
+            base.Dispose();
+        }
+
         #endregion
     }
 }
diff --git a/RGB.NET.Devices.Wooting/WootingDeviceProvider.cs b/RGB.NET.Devices.Wooting/WootingDeviceProvider.cs
index 4635f74..638949a 100644
--- a/RGB.NET.Devices.Wooting/WootingDeviceProvider.cs
+++ b/RGB.NET.Devices.Wooting/WootingDeviceProvider.cs
@@ -143,6 +143,9 @@ namespace RGB.NET.Devices.Wooting
         /// <inheritdoc />
         public void Dispose()
         {
+            try { UpdateTrigger?.Dispose(); }
+            catch { /* at least we tried */ }
+
             try { _WootingSDK.Reset(); }
             catch { /* Unlucky.. */ }