diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp
index d7cf39ae2e..ecdf558066 100644
--- a/src/libcamera/request.cpp
+++ b/src/libcamera/request.cpp
@@ -108,8 +108,6 @@ bool Request::Private::completeBuffer(FrameBuffer *buffer)
 	LIBCAMERA_TRACEPOINT(request_complete_buffer, this, buffer);
 
 	Request *request = LIBCAMERA_O_PTR();
-	camera_->bufferCompleted.emit(request, buffer);
-
 	auto it = request->bufferMap_.find(buffer->_d()->stream_);
 	ASSERT(it != request->bufferMap_.end());
 	ASSERT(it->second == buffer || !it->second);
@@ -124,6 +122,8 @@ bool Request::Private::completeBuffer(FrameBuffer *buffer)
 	if (buffer->metadata().status == FrameMetadata::FrameCancelled)
 		cancelled_ = true;
 
+	camera_->bufferCompleted.emit(request, buffer);
+
 	return !hasPendingBuffers();
 }