diff --git a/src/main_window.cpp b/src/main_window.cpp
index bc725233..96fd098c 100644
--- a/src/main_window.cpp
+++ b/src/main_window.cpp
@@ -221,7 +221,7 @@ void drawWindow() {
         sigPath.setVolume(volume);
     }
 
-    if (devId != _devId) {
+    if (devId != _devId && soapy.devList.size() > 0) {
         _devId = devId;
         soapy.setDevice(soapy.devList[devId]);
         srId = 0;