diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml
index 646bfcce3218d25381242ea58b7e8234fb56ab27..4633168aa30cd6b53f6f664c607264adbb6d7d83 100644
--- a/src/VehicleSetup/FirmwareUpgrade.qml
+++ b/src/VehicleSetup/FirmwareUpgrade.qml
@@ -168,7 +168,7 @@ SetupPage {
                     function accept() {
                         hideDialog()
                         if (_singleFirmwareMode) {
-                            controller.flashSingleFirmwareMode()
+                            controller.flashSingleFirmwareMode(controller.selectedFirmwareType)
                         } else {
                             var stack = apmFlightStack.checked ? FirmwareUpgradeController.AutoPilotStackAPM : FirmwareUpgradeController.AutoPilotStackPX4
                             if (px4Flow) {
@@ -353,7 +353,7 @@ SetupPage {
                             currentIndex:   controller.selectedFirmwareType
 
                             onActivated: {
-                                controller.selectedFirmwareType = index
+                                controller.selectedFirmwareType = model.get(index).firmwareType
                                 if (model.get(index).firmwareType === FirmwareUpgradeController.BetaFirmware) {
                                     firmwareVersionWarningLabel.visible = true
                                     firmwareVersionWarningLabel.text = qsTr("WARNING: BETA FIRMWARE. ") +
diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc
index f417e86ab20abd946667b818eba8579507a818df..2e42ac11b712f4d0d81ad1516a05849907df0ba3 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
@@ -114,9 +114,9 @@ void FirmwareUpgradeController::flash(const FirmwareIdentifier& firmwareId)
     flash(firmwareId.autopilotStackType, firmwareId.firmwareType, firmwareId.firmwareVehicleType);
 }
 
-void FirmwareUpgradeController::flashSingleFirmwareMode(void)
+void FirmwareUpgradeController::flashSingleFirmwareMode(FirmwareType_t firmwareType)
 {
-    flash(SingleFirmwareMode, StableFirmware, DefaultVehicleFirmware);
+    flash(SingleFirmwareMode, firmwareType, DefaultVehicleFirmware);
 }
 
 void FirmwareUpgradeController::cancel(void)
diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h
index 80b1d563208543e6a6a4d1820a8defb42e11aaa2..4c48cf2ac66a6ca962dcb8ded942b52f542983cd 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.h
+++ b/src/VehicleSetup/FirmwareUpgradeController.h
@@ -123,7 +123,7 @@ public:
                            FirmwareVehicleType_t vehicleType = DefaultVehicleFirmware );
 
     /// Called to flash when upgrade is running in singleFirmwareMode
-    Q_INVOKABLE void flashSingleFirmwareMode(void);
+    Q_INVOKABLE void flashSingleFirmwareMode(FirmwareType_t firmwareType);
 
     Q_INVOKABLE FirmwareVehicleType_t vehicleTypeFromVersionIndex(int index);