diff --git a/src/PlanView/PlanToolBar.qml b/src/PlanView/PlanToolBar.qml
index 248a2962ea51fa63eece13b2e7d4499bb8790944..3570554c09412bbd85d3caddbac2528f96dabc59 100644
--- a/src/PlanView/PlanToolBar.qml
+++ b/src/PlanView/PlanToolBar.qml
@@ -111,7 +111,6 @@ Rectangle {
         }
     }
 
-
     RowLayout {
         anchors.top:            parent.top
         anchors.bottom:         parent.bottom
@@ -247,7 +246,7 @@ Rectangle {
         anchors.right:          parent.right
         anchors.verticalCenter: parent.verticalCenter
         text:                   missionController ? (missionController.dirty ? qsTr("Upload Required") : qsTr("Upload")) : ""
-        enabled:                _activeVehicle
+        enabled:                _activeVehicle && !missionController.syncInProgress
         visible:                _activeVehicle && _manualUpload
         onClicked:              missionController.upload()