diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml
index 10427a08a5b59f4c92c3e8f664d9c33f32c4330e..2261691bc9da77b3cca3ac409903c4626b50a39e 100644
--- a/src/FlightDisplay/GuidedActionsController.qml
+++ b/src/FlightDisplay/GuidedActionsController.qml
@@ -72,7 +72,7 @@ Item {
     readonly property string mvPauseMessage:                    qsTr("Pause all vehicles at their current position.")
     readonly property string vtolTransitionFwdMessage:          qsTr("Transition VTOL to fixed wing flight.")
     readonly property string vtolTransitionMRMessage:           qsTr("Transition VTOL to multi-rotor flight.")
-    readonly property string overrideUploadMessage:             qsTr("Vehicle is not inside service area. Override upload lock?")
+    readonly property string overrideUploadMessage:             qsTr("Vehicle is not inside service area. Upload nevertheless?")
 
     readonly property int actionRTL:                        1
     readonly property int actionLand:                       2
diff --git a/src/Wima/WimaController.cc b/src/Wima/WimaController.cc
index 2d705d3a7a28dfabc2b5f30957ebb653700e159e..df7db349d4146f1b2fa9167221c4b31a755f8dc4 100644
--- a/src/Wima/WimaController.cc
+++ b/src/Wima/WimaController.cc
@@ -185,8 +185,8 @@ void WimaController::resetPhase()
 
 bool WimaController::uploadToVehicle()
 {
-    if (!_serviceArea.containsCoordinate(_masterController->managerVehicle()->coordinate())) {
-        qgcApp()->showMessage(tr("Vehicle is not inside service area."));
+    if (   !_serviceArea.containsCoordinate(_masterController->managerVehicle()->coordinate())
+        && _currentMissionItems.count() > 0) {
         setUploadOverrideRequired(true);
         return false;
     }