diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml
index 9cf7b9b4e73945b87213ace1fa854e8746cae235..87d1556f396807acba0f03724e4d742f2662edad 100644
--- a/src/VehicleSetup/FirmwareUpgrade.qml
+++ b/src/VehicleSetup/FirmwareUpgrade.qml
@@ -117,8 +117,6 @@ QGCView {
             statusTextArea.append(flashFailText)
             flashCompleteWaitTimer.running = true
         }
-
-        onFlashComplete: flashCompleteWaitTimer.running = true
     }
 
     onCompleted: {
@@ -128,22 +126,6 @@ QGCView {
         }
     }
 
-    // After a flash completes we start this timer to trigger resetting the ui back to it's initial state of being ready to
-    // flash another board. We do this only after the timer triggers to leave the results of the previous flash on the screen
-    // for a small amount amount of time.
-
-    Timer {
-        id:         flashCompleteWaitTimer
-        interval:   15000
-
-        onTriggered: {
-            initialBoardSearch = true
-            progressBar.value = 0
-            statusTextArea.append(welcomeText)
-            controller.startBoardSearch()
-        }
-    }
-
     Component {
         id: pixhawkFirmwareSelectDialog