diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
index 06fef21..fa58585 100644
--- a/src/v4l2/v4l2_camera_proxy.cpp
+++ b/src/v4l2/v4l2_camera_proxy.cpp
@@ -444,11 +444,6 @@ int V4L2CameraProxy::freeBuffers()
 {
 	LOG(V4L2Compat, Debug) << "Freeing libcamera bufs";
 
-	int ret = vcam_->streamOff();
-	if (ret < 0) {
-		LOG(V4L2Compat, Error) << "Failed to stop stream";
-		return ret;
-	}
 	vcam_->freeBuffers();
 	bufferCount_ = 0;
 
@@ -476,6 +471,12 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf
 	memset(arg->reserved, 0, sizeof(arg->reserved));
 
 	if (arg->count == 0) {
+		if (vcam_->isRunning())
+			return -EBUSY;
+
+		for (struct v4l2_buffer &buf : buffers_)
+			buf.flags &= ~(V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE);
+
 		release(file);
 		return freeBuffers();
 	}