diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c
index ace5f99bbc4d..212809254527 100644
--- a/drivers/media/video/uvc/uvc_queue.c
+++ b/drivers/media/video/uvc/uvc_queue.c
@@ -371,7 +371,7 @@ checks:
 				((!list_empty(&queue->mainqueue)) || (!(queue->flags & UVC_QUEUE_STREAMING))));
 			mutex_lock(&queue->mutex);
 
-			if (ret)
+			if (ret || (!(queue->flags & UVC_QUEUE_STREAMING)))
 				goto done;
 
 			goto checks;