diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
index dfa91adc3a0124da2470a855f04e398420a5648b..190cf8e21a0dd5ae9d28b859109f3453aa2f9746 100644
--- a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
@@ -90,12 +90,11 @@ void PX4FirmwareUpgradeThreadWorker::_findBoardOnce(void)
                         emit foundBoardInfo(bootloaderVersion, boardId, flashSize);
                     } else {
                         emit error(_bootloader->errorString());
-                        return;
                     }
                 } else {
                     emit error(_bootloader->errorString());
-                    return;
                 }
+                return;
             }
         }
     } else {