diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
index 4b886f7ca..19db80137 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
@@ -49,6 +49,7 @@ void AutoUpdatePage::autoUpdate()
     Q_ASSERT(uploader);
     m_isUpdating = true;
     uploader->autoUpdate(ui->eraseSettings->isChecked());
+    getWizard()->setRestartNeeded(true);
 }
 
 void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
index 517c65f3e..4707cc47f 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
@@ -100,7 +100,9 @@ int SetupWizard::nextId() const
             return PAGE_INPUT;
 
         case CONTROLLER_NANO:
-            reboot();
+            if (isRestartNeeded()) {
+                reboot();
+            }
             return PAGE_INPUT;
 
         case CONTROLLER_OPLINK: