diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp
index 1681572cdf..e8970dccc9 100644
--- a/src/slic3r/GUI/CalibrationPanel.cpp
+++ b/src/slic3r/GUI/CalibrationPanel.cpp
@@ -526,6 +526,14 @@ void CalibrationPanel::update_all() {
     if (!dev) return;
     obj = dev->get_selected_machine();
 
+    // check valid machine
+    if (obj && dev->get_my_machine(obj->dev_id) == nullptr) {
+        dev->set_selected_machine("");
+        if (m_agent) m_agent->set_user_selected_machine("");
+        show_status((int) MONITOR_NO_PRINTER);
+        return;
+    }
+
     // update current wizard only
     int curr_selected = m_tabpanel->GetSelection();
 
@@ -543,15 +551,6 @@ void CalibrationPanel::update_all() {
         }
     }
 
-    // check valid machine
-    if (obj && dev->get_my_machine(obj->dev_id) == nullptr) {
-        dev->set_selected_machine("");
-        if (m_agent)
-            m_agent->set_user_selected_machine("");
-        show_status((int)MONITOR_NO_PRINTER);
-        return;
-    }
-
     if (wxGetApp().is_user_login()) {
         dev->check_pushing();
         try {