diff --git a/drivers/media/platform/vivid/vivid-kthread-cap.c b/drivers/media/platform/vivid/vivid-kthread-cap.c
index 6cf495a7d5cc..ea27e2059e26 100644
--- a/drivers/media/platform/vivid/vivid-kthread-cap.c
+++ b/drivers/media/platform/vivid/vivid-kthread-cap.c
@@ -913,7 +913,7 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)
 {
 	dprintk(dev, 1, "%s\n", __func__);
 
-	if (dev->kthread_vid_cap == NULL)
+	if (dev->kthread_vid_cap == NULL || !*pstreaming)
 		return;
 
 	*pstreaming = false;
diff --git a/drivers/media/platform/vivid/vivid-kthread-out.c b/drivers/media/platform/vivid/vivid-kthread-out.c
index ce5bcda2348c..5c42b3695ade 100644
--- a/drivers/media/platform/vivid/vivid-kthread-out.c
+++ b/drivers/media/platform/vivid/vivid-kthread-out.c
@@ -261,7 +261,7 @@ void vivid_stop_generating_vid_out(struct vivid_dev *dev, bool *pstreaming)
 {
 	dprintk(dev, 1, "%s\n", __func__);
 
-	if (dev->kthread_vid_out == NULL)
+	if (dev->kthread_vid_out == NULL || !*pstreaming)
 		return;
 
 	*pstreaming = false;