diff --git a/src/FlightMap/Widgets/VideoPageWidget.qml b/src/FlightMap/Widgets/VideoPageWidget.qml
index a0046ddfd888c9044dcedf5476b52ec44cd7b592..10d0e6503e9577ee7784a0fcef6bae1efc2a5258 100644
--- a/src/FlightMap/Widgets/VideoPageWidget.qml
+++ b/src/FlightMap/Widgets/VideoPageWidget.qml
@@ -45,12 +45,20 @@ Item {
         columnSpacing:      ScreenTools.defaultFontPixelWidth * 2
         rowSpacing:         ScreenTools.defaultFontPixelHeight
         anchors.centerIn:   parent
+        Connections {
+            // For some reason, the normal signal is not reflected in the control below
+            target: QGroundControl.settingsManager.videoSettings.streamEnabled
+            onRawValueChanged: {
+                enableSwitch.checked = QGroundControl.settingsManager.videoSettings.streamEnabled.rawValue
+            }
+        }
         // Enable/Disable Video Streaming
         QGCLabel {
            text:            qsTr("Enable Stream")
            font.pointSize:  ScreenTools.smallFontPointSize
         }
         QGCSwitch {
+            id:             enableSwitch
             enabled:        _streamingEnabled
             checked:        QGroundControl.settingsManager.videoSettings.streamEnabled.rawValue
             onClicked: {