diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc
index 6ce48593a234c364a7b76db8a61c260b9d4c0fd9..7ddda9ccc6408579c41f3876bd4d95e3a4a7d251 100644
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
@@ -1491,7 +1491,7 @@ QGCCameraControl::handleVideoInfo(const mavlink_video_stream_information_t* vi)
 {
     qCDebug(CameraControlLog) << "handleVideoInfo:" << vi->stream_id << vi->uri;
     _expectedCount = vi->count;
-    if(!_findStream(vi->stream_id)) {
+    if(!_findStream(vi->stream_id, false)) {
         qCDebug(CameraControlLog) << "Create stream handler for stream ID:" << vi->stream_id;
         QGCVideoStreamInfo* pStream = new QGCVideoStreamInfo(this, vi);
         QQmlEngine::setObjectOwnership(pStream, QQmlEngine::CppOwnership);
@@ -1640,7 +1640,7 @@ QGCCameraControl::_requestStreamStatus(uint8_t streamID)
 
 //-----------------------------------------------------------------------------
 QGCVideoStreamInfo*
-QGCCameraControl::_findStream(uint8_t id)
+QGCCameraControl::_findStream(uint8_t id, bool report)
 {
     for(int i = 0; i < _streams.count(); i++) {
         if(_streams[i]) {
@@ -1654,7 +1654,9 @@ QGCCameraControl::_findStream(uint8_t id)
             }
         }
     }
-    qWarning() << "Stream id not found:" << id;
+    if(report) {
+        qWarning() << "Stream id not found:" << id;
+    }
     return nullptr;
 }
 
@@ -1676,7 +1678,7 @@ QGCCameraControl::_streamTimeout()
     }
     for(uint8_t i = 0; i < _expectedCount; i++) {
         //-- Stream ID starts at 1
-        if(!_findStream(i+1)) {
+        if(!_findStream(i+1, false)) {
             _requestStreamInfo(i+1);
             return;
         }
diff --git a/src/Camera/QGCCameraControl.h b/src/Camera/QGCCameraControl.h
index 1c0526f840c2e176eaf65e40fd46c05f77feec17..938009a9c6ca74846f85504b43278206c77e8fda 100644
--- a/src/Camera/QGCCameraControl.h
+++ b/src/Camera/QGCCameraControl.h
@@ -292,7 +292,7 @@ protected:
     virtual void    _setCameraMode          (CameraMode mode);
     virtual void    _requestStreamInfo      (uint8_t streamID);
     virtual void    _requestStreamStatus    (uint8_t streamID);
-    virtual QGCVideoStreamInfo* _findStream (uint8_t streamID);
+    virtual QGCVideoStreamInfo* _findStream (uint8_t streamID, bool report = true);
 
 protected slots:
     virtual void    _initWhenReady          ();