diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 38ecf79c..c653b3be 100644
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -1018,8 +1018,12 @@ namespace pv
                 }
             }
 
-            _session->set_device(devHandle);
-            _last_device_index = _device_selector.currentIndex();        
+            if (_session->set_device(devHandle)){
+                _last_device_index = _device_selector.currentIndex();   
+            }
+            else{
+                update_device_list(); // Reload the list.
+            }
         }
 
         void SamplingBar::enable_toggle(bool enable)