diff --git a/src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml b/src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml
index 1b2fa388a0081c586daf7dd8c7e85ffd3814c967..4da593a801f9f92d64b452621533c8114b5c1330 100644
--- a/src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml
+++ b/src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml
@@ -23,9 +23,6 @@ FirstRunPrompt {
 
     property real   _margins:               ScreenTools.defaultFontPixelWidth
     property var    _appSettings:           QGroundControl.settingsManager.appSettings
-    property var    _offlineVehicle:        QGroundControl.multiVehicleManager.offlineEditingVehicle
-    property bool   _showCruiseSpeed:       !_offlineVehicle.multiRotor
-    property bool   _showHoverSpeed:        _offlineVehicle.multiRotor || _offlineVehicle.vtol
     property bool   _multipleFirmware:      !QGroundControl.singleFirmwareSupport
     property bool   _multipleVehicleTypes:  !QGroundControl.singleVehicleSupport
     property real   _fieldWidth:            ScreenTools.defaultFontPixelWidth * 16
@@ -77,28 +74,6 @@ FirstRunPrompt {
                     indexModel:             false
                     visible:                _multipleVehicleTypes
                 }
-
-                QGCLabel {
-                    Layout.fillWidth:   true
-                    text:               qsTr("Mission Cruise Speed")
-                    visible:            _showCruiseSpeed
-                }
-                FactTextField {
-                    Layout.preferredWidth:  _fieldWidth
-                    fact:                   QGroundControl.settingsManager.appSettings.offlineEditingCruiseSpeed
-                    visible:                _showCruiseSpeed
-                }
-
-                QGCLabel {
-                    Layout.fillWidth:   true
-                    text:               qsTr("Mission Hover Speed")
-                    visible:            _showHoverSpeed
-                }
-                FactTextField {
-                    Layout.preferredWidth:  _fieldWidth
-                    fact:                   QGroundControl.settingsManager.appSettings.offlineEditingHoverSpeed
-                    visible:                _showHoverSpeed
-                }
             }
         }
     }
diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/PlanView/MissionSettingsEditor.qml
index e025eff260b492ba9a1935988656d0f89deabdd0..a11db59dd66a9158d9c55bc1678289f3d315732b 100644
--- a/src/PlanView/MissionSettingsEditor.qml
+++ b/src/PlanView/MissionSettingsEditor.qml
@@ -220,6 +220,16 @@ Rectangle {
                     visible:    _multipleVehicleTypes && !_noMissionItemsAdded
                 }
 
+                QGCLabel {
+                    Layout.columnSpan:      2
+                    Layout.alignment:       Qt.AlignHCenter
+                    Layout.fillWidth:       true
+                    wrapMode:               Text.WordWrap
+                    font.pointSize:         ScreenTools.smallFontPointSize
+                    text:                   qsTr("The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.")
+                    visible:                _showCruiseSpeed || _showHoverSpeed
+                }
+
                 QGCLabel {
                     text:               qsTr("Cruise speed")
                     visible:            _showCruiseSpeed