diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 94ec204ce87b..9f80708e3a77 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1010,6 +1010,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,
 				-1,
 				&replaced);
 		state->hdr_metadata_changed |= replaced;
+		if (replaced)
+			state->blob_id = val;
 		return ret;
 	} else if (connector->funcs->atomic_set_property) {
 		return connector->funcs->atomic_set_property(connector,
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 75e7abcf5810..8e483c28b116 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -684,6 +684,7 @@ struct drm_connector_state {
 	 */
 	struct drm_property_blob *hdr_source_metadata_blob_ptr;
 	bool hdr_metadata_changed : 1;
+	uint64_t blob_id;
 };
 
 /**