diff --git a/include/libcamera/request.h b/include/libcamera/request.h
index 290983f613..c86259c59b 100644
--- a/include/libcamera/request.h
+++ b/include/libcamera/request.h
@@ -55,6 +55,7 @@ public:
 	int addBuffer(const Stream *stream, FrameBuffer *buffer,
 		      std::unique_ptr<Fence> &&fence = {});
 	FrameBuffer *findBuffer(const Stream *stream) const;
+	void enableStream(const Stream *stream, bool enabled);
 
 	uint32_t sequence() const;
 	uint64_t cookie() const { return cookie_; }
diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp
index 5bb1617b51..d7cf39ae2e 100644
--- a/src/libcamera/request.cpp
+++ b/src/libcamera/request.cpp
@@ -110,13 +110,16 @@ bool Request::Private::completeBuffer(FrameBuffer *buffer)
 	Request *request = LIBCAMERA_O_PTR();
 	camera_->bufferCompleted.emit(request, buffer);
 
-	ASSERT(request->findBuffer(buffer->_d()->stream_) == buffer);
+	auto it = request->bufferMap_.find(buffer->_d()->stream_);
+	ASSERT(it != request->bufferMap_.end());
+	ASSERT(it->second == buffer || !it->second);
 
 	ASSERT(pending_ > 0);
 	pending_ -= 1;
 
 	buffer->_d()->setRequest(nullptr);
 	buffer->_d()->stream_ = nullptr;
+	it->second = buffer;
 
 	if (buffer->metadata().status == FrameMetadata::FrameCancelled)
 		cancelled_ = true;
@@ -337,6 +340,31 @@ FrameBuffer *Request::findBuffer(const Stream *stream) const
 	return it->second;
 }
 
+/**
+ * \brief Change whether the particular stream should be captured
+ * \param[in] stream The stream
+ * \param[in] enabled Whether to enable or disable the stream
+ */
+void Request::enableStream(const Stream *stream, bool enabled)
+{
+	ASSERT(stream);
+
+	Request::Private *const d = _d();
+
+	if (enabled) {
+		const auto [it, inserted] = bufferMap_.try_emplace(stream);
+
+		it->second = nullptr;
+		d->pending_ += inserted;
+	} else {
+		d->pending_ -= bufferMap_.erase(stream);
+	}
+
+	LOG(Request, Debug)
+		<< "request:" << this << " stream:" << stream
+		<< ' ' << (enabled ? "en" : "dis") << "abled pending:" << d->pending_;
+}
+
 /**
  * \brief Retrieve the sequence number for the request
  *