diff --git a/devicemanagement/device_manager.py b/devicemanagement/device_manager.py
index fb0f28e..1bcabfd 100644
--- a/devicemanagement/device_manager.py
+++ b/devicemanagement/device_manager.py
@@ -130,7 +130,7 @@ class DeviceManager:
 
     ## CURRENT DEVICE
     def set_current_device(self, index: int = None):
-        if index == None:
+        if index == None or len(self.devices) == 0:
             self.data_singleton.current_device = None
             self.data_singleton.device_available = False
             self.data_singleton.gestalt_path = None