diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
index 4568c679f..517c65f3e 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
@@ -96,10 +96,13 @@ int SetupWizard::nextId() const
     {
         switch (getControllerType()) {
         case CONTROLLER_REVO:
-        case CONTROLLER_NANO:
         case CONTROLLER_DISCOVERYF4:
             return PAGE_INPUT;
 
+        case CONTROLLER_NANO:
+            reboot();
+            return PAGE_INPUT;
+
         case CONTROLLER_OPLINK:
         default:
             return PAGE_NOTYETIMPLEMENTED;
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index ba8eebf9c..e218704b1 100644
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -1008,6 +1008,14 @@ void UploaderGadgetWidget::startAutoUpdate()
 void UploaderGadgetWidget::startAutoUpdateErase()
 {
     startAutoUpdate(true);
+
+    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
+    UAVObjectUtilManager *utilMngr     = pm->getObject<UAVObjectUtilManager>();
+    int id = utilMngr->getBoardModel();
+
+    if (id == 0x905) {
+        systemReset();
+    }
 }
 
 void UploaderGadgetWidget::startAutoUpdate(bool erase)