diff --git a/Project-Aurora/AuroraDeviceManager/Devices/DeviceManager.cs b/Project-Aurora/AuroraDeviceManager/Devices/DeviceManager.cs
index 7eab94701..b57857877 100644
--- a/Project-Aurora/AuroraDeviceManager/Devices/DeviceManager.cs
+++ b/Project-Aurora/AuroraDeviceManager/Devices/DeviceManager.cs
@@ -103,7 +103,8 @@ private static bool DeviceEnabled(DeviceContainer dc)
 
     public Task ShutdownDevices()
     {
-        var shutdownTasks = InitializedDeviceContainers.Select(dc => dc.DisableDevice());
+        var startingDevices = DeviceContainers.Where(dc => dc.Device is { IsInitialized: false, IsDoingWork: true });
+        var shutdownTasks = InitializedDeviceContainers.Union(startingDevices).Select(dc => dc.DisableDevice());
 
         return Task.WhenAll(shutdownTasks);
     }