diff --git a/custom-example/res/CustomCameraControl.qml b/custom-example/res/CustomCameraControl.qml
index 3a9350a0586685c299d89eeb65035b3ca9b7a40a..64a2b66276dba19cef5fcb5737c4b9289738a7dd 100644
--- a/custom-example/res/CustomCameraControl.qml
+++ b/custom-example/res/CustomCameraControl.qml
@@ -44,6 +44,8 @@ Item {
     property real   _labelFieldWidth:       ScreenTools.defaultFontPixelWidth  * 28
     property real   _editFieldWidth:        ScreenTools.defaultFontPixelWidth  * 30
     property real   _editFieldHeight:       ScreenTools.defaultFontPixelHeight * 2
+    property var    _videoReceiver:         QGroundControl.videoManager.videoReceiver
+    property bool   _recordingLocalVideo:   _videoReceiver && _videoReceiver.recording
 
     property var    _dynamicCameras:        activeVehicle ? activeVehicle.dynamicCameras : null
     property bool   _isCamera:              _dynamicCameras ? _dynamicCameras.cameras.count > 0 : false
@@ -301,10 +303,18 @@ Item {
                                 if(_cameraVideoMode) {
                                     if(_camera.videoStatus === QGCCameraControl.VIDEO_CAPTURE_STATUS_RUNNING) {
                                         _camera.stopVideo()
+                                        //-- Local video as well
+                                        if (_recordingVideo) {
+                                            _videoReceiver.stopRecording()
+                                        }
                                     } else {
                                         if(!_fullSD) {
                                             _camera.startVideo()
                                         }
+                                        //-- Local video as well
+                                        if(_videoReceiver) {
+                                            _videoReceiver.startRecording()
+                                        }
                                     }
                                 } else {
                                     if(_camera.photoStatus === QGCCameraControl.PHOTO_CAPTURE_INTERVAL_IDLE || _camera.photoStatus === QGCCameraControl.PHOTO_CAPTURE_INTERVAL_IN_PROGRESS) {