diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc
index 39605d0..3eb7219 100644
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
@@ -1928,13 +1928,16 @@ void
 QGCCameraControl::_checkForVideoStreams()
 {
     if(_info.flags & CAMERA_CAP_FLAGS_HAS_VIDEO_STREAM) {
-        connect(&_streamInfoTimer, &QTimer::timeout, this, &QGCCameraControl::_streamTimeout);
-        _streamInfoTimer.setSingleShot(false);
-        connect(&_streamStatusTimer, &QTimer::timeout, this, &QGCCameraControl::_streamStatusTimeout);
-        _streamStatusTimer.setSingleShot(true);
-        //-- Request all streams
-        _requestStreamInfo(0);
-        _streamInfoTimer.start(2000);
+        //-- Skip it if using Taisync as it has its own video settings
+        if(!qgcApp()->toolbox()->videoManager()->isTaisync()) {
+            connect(&_streamInfoTimer, &QTimer::timeout, this, &QGCCameraControl::_streamTimeout);
+            _streamInfoTimer.setSingleShot(false);
+            connect(&_streamStatusTimer, &QTimer::timeout, this, &QGCCameraControl::_streamStatusTimeout);
+            _streamStatusTimer.setSingleShot(true);
+            //-- Request all streams
+            _requestStreamInfo(0);
+            _streamInfoTimer.start(2000);
+        }
     }
 }