diff --git a/packages/block-editor/src/hooks/layout.js b/packages/block-editor/src/hooks/layout.js
index 86e7124b945d0..b7aa9b3682b27 100644
--- a/packages/block-editor/src/hooks/layout.js
+++ b/packages/block-editor/src/hooks/layout.js
@@ -400,7 +400,7 @@ export const withLayoutStyles = createHigherOrderComponent(
 			layoutClasses
 		);
 
-		useStyleOverride( { id, css } );
+		useStyleOverride( { css } );
 
 		return (
 			<BlockListBlock
diff --git a/packages/block-editor/src/hooks/utils.js b/packages/block-editor/src/hooks/utils.js
index c6ca3ddd935c3..f67e9648697be 100644
--- a/packages/block-editor/src/hooks/utils.js
+++ b/packages/block-editor/src/hooks/utils.js
@@ -118,19 +118,33 @@ export function shouldSkipSerialization( blockType, featureSet, feature ) {
 	return skipSerialization;
 }
 
-export function useStyleOverride( style ) {
+export function useStyleOverride( { id, css, assets, __unstableType } = {} ) {
 	const { setStyleOverride, deleteStyleOverride } = unlock(
 		useDispatch( blockEditorStore )
 	);
 	const fallbackId = useId();
 	useEffect( () => {
-		if ( ! style ) return;
-		const id = style.id || fallbackId;
-		setStyleOverride( id, style );
+		// Unmount if there is CSS and assets are empty.
+		if ( ! css && ! assets ) return;
+		const _id = id || fallbackId;
+		setStyleOverride( _id, {
+			id,
+			css,
+			assets,
+			__unstableType,
+		} );
 		return () => {
-			deleteStyleOverride( id );
+			deleteStyleOverride( _id );
 		};
-	}, [ fallbackId, style, setStyleOverride, deleteStyleOverride ] );
+	}, [
+		id,
+		css,
+		assets,
+		__unstableType,
+		fallbackId,
+		setStyleOverride,
+		deleteStyleOverride,
+	] );
 }
 
 /**