diff --git a/packages/block-editor/src/components/block-list/block-wrapper.js b/packages/block-editor/src/components/block-list/block-wrapper.js
index c728b2a8a01364..d81cba761357dd 100644
--- a/packages/block-editor/src/components/block-list/block-wrapper.js
+++ b/packages/block-editor/src/components/block-list/block-wrapper.js
@@ -19,6 +19,7 @@ import { focus, isTextField, placeCaretAtHorizontalEdge } from '@wordpress/dom';
 import { BACKSPACE, DELETE, ENTER } from '@wordpress/keycodes';
 import { __, sprintf } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
+import { __unstableBlockPropsFilterContext as BlockPropsFilterContext } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -235,6 +236,22 @@ const elements = [
 	'nav',
 ];
 
+const BlockSaveComponent = forwardRef(
+	( { children, tagName: TagName = 'div', ...props }, wrapper ) => {
+		return (
+			<BlockPropsFilterContext.Consumer>
+				{ ( filter ) => {
+					return (
+						<TagName ref={ wrapper } { ...filter( props ) }>
+							{ children }
+						</TagName>
+					);
+				} }
+			</BlockPropsFilterContext.Consumer>
+		);
+	}
+);
+
 const ExtendedBlockComponent = elements.reduce( ( acc, element ) => {
 	acc[ element ] = forwardRef( ( props, ref ) => {
 		return <BlockComponent { ...props } ref={ ref } tagName={ element } />;
@@ -242,4 +259,13 @@ const ExtendedBlockComponent = elements.reduce( ( acc, element ) => {
 	return acc;
 }, BlockComponent );
 
+ExtendedBlockComponent.Save = elements.reduce( ( acc, element ) => {
+	acc[ element ] = forwardRef( ( props, ref ) => {
+		return (
+			<BlockSaveComponent { ...props } ref={ ref } tagName={ element } />
+		);
+	} );
+	return acc;
+}, BlockSaveComponent );
+
 export const Block = ExtendedBlockComponent;
diff --git a/packages/block-library/src/column/save.js b/packages/block-library/src/column/save.js
index d0dda9de3174b3..ea938c3417cc24 100644
--- a/packages/block-library/src/column/save.js
+++ b/packages/block-library/src/column/save.js
@@ -6,7 +6,10 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { InnerBlocks } from '@wordpress/block-editor';
+import {
+	InnerBlocks,
+	__experimentalBlock as Block,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { verticalAlignment, width } = attributes;
@@ -21,8 +24,8 @@ export default function save( { attributes } ) {
 	}
 
 	return (
-		<div className={ wrapperClasses } style={ style }>
+		<Block.Save.div className={ wrapperClasses } style={ style }>
 			<InnerBlocks.Content />
-		</div>
+		</Block.Save.div>
 	);
 }
diff --git a/packages/block-library/src/columns/save.js b/packages/block-library/src/columns/save.js
index 3d2249389910d2..785cdf8205af99 100644
--- a/packages/block-library/src/columns/save.js
+++ b/packages/block-library/src/columns/save.js
@@ -6,7 +6,11 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { InnerBlocks, getColorClassName } from '@wordpress/block-editor';
+import {
+	InnerBlocks,
+	getColorClassName,
+	__experimentalBlock as Block,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const {
@@ -38,8 +42,11 @@ export default function save( { attributes } ) {
 	};
 
 	return (
-		<div className={ className ? className : undefined } style={ style }>
+		<Block.Save.div
+			className={ className ? className : undefined }
+			style={ style }
+		>
 			<InnerBlocks.Content />
-		</div>
+		</Block.Save.div>
 	);
 }
diff --git a/packages/block-library/src/image/save.js b/packages/block-library/src/image/save.js
index 4124e9c951e382..6235bd9203a3d7 100644
--- a/packages/block-library/src/image/save.js
+++ b/packages/block-library/src/image/save.js
@@ -7,7 +7,10 @@ import { isEmpty } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import {
+	RichText,
+	__experimentalBlock as Block,
+} from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const {
@@ -67,11 +70,13 @@ export default function save( { attributes } ) {
 
 	if ( 'left' === align || 'right' === align || 'center' === align ) {
 		return (
-			<div>
+			<Block.Save.div>
 				<figure className={ classes }>{ figure }</figure>
-			</div>
+			</Block.Save.div>
 		);
 	}
 
-	return <figure className={ classes }>{ figure }</figure>;
+	return (
+		<Block.Save.figure className={ classes }>{ figure }</Block.Save.figure>
+	);
 }
diff --git a/packages/block-library/src/paragraph/save.js b/packages/block-library/src/paragraph/save.js
index 2cdeeb46e60c9c..b70f810c60e174 100644
--- a/packages/block-library/src/paragraph/save.js
+++ b/packages/block-library/src/paragraph/save.js
@@ -10,6 +10,7 @@ import {
 	getColorClassName,
 	getFontSizeClass,
 	RichText,
+	__experimentalBlock as Block,
 } from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
@@ -51,7 +52,7 @@ export default function save( { attributes } ) {
 
 	return (
 		<RichText.Content
-			tagName="p"
+			tagName={ Block.Save.p }
 			style={ styles }
 			className={ className ? className : undefined }
 			value={ content }
diff --git a/packages/blocks/src/api/index.js b/packages/blocks/src/api/index.js
index 99c28b08f1802f..33196cb8f42023 100644
--- a/packages/blocks/src/api/index.js
+++ b/packages/blocks/src/api/index.js
@@ -24,6 +24,7 @@ export {
 	getBlockMenuDefaultClassName,
 	getSaveElement,
 	getSaveContent,
+	BlockPropsFilterContext as __unstableBlockPropsFilterContext,
 } from './serializer';
 export { isValidBlockContent } from './validation';
 export { getCategories, setCategories, updateCategory } from './categories';
diff --git a/packages/blocks/src/api/serializer.js b/packages/blocks/src/api/serializer.js
index 394a212dd88e9e..2a17b222884390 100644
--- a/packages/blocks/src/api/serializer.js
+++ b/packages/blocks/src/api/serializer.js
@@ -6,7 +6,12 @@ import { isEmpty, reduce, isObject, castArray, startsWith } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { Component, cloneElement, renderToString } from '@wordpress/element';
+import {
+	Component,
+	cloneElement,
+	renderToString,
+	createContext,
+} from '@wordpress/element';
 import { hasFilter, applyFilters } from '@wordpress/hooks';
 import isShallowEqual from '@wordpress/is-shallow-equal';
 
@@ -17,6 +22,7 @@ import {
 	getBlockType,
 	getFreeformContentHandlerName,
 	getUnregisteredTypeHandlerName,
+	hasBlockSupport,
 } from './registration';
 import { normalizeBlockType } from './utils';
 import BlockContentProvider from '../block-content-provider';
@@ -68,6 +74,8 @@ export function getBlockMenuDefaultClassName( blockName ) {
 	);
 }
 
+export const BlockPropsFilterContext = createContext();
+
 /**
  * Given a block type containing a save render implementation and attributes, returns the
  * enhanced element to be saved or string when raw HTML expected.
@@ -95,27 +103,43 @@ export function getSaveElement(
 	}
 
 	let element = save( { attributes, innerBlocks } );
+	let blockPropsFilter = ( props ) => props;
+
+	if ( hasFilter( 'blocks.getSaveContent.extraProps' ) ) {
+		if ( hasBlockSupport( blockType, 'lightBlockWrapper', false ) ) {
+			blockPropsFilter = ( props ) => {
+				/**
+				 * Filters the props applied to the block save result element.
+				 *
+				 * @param {Object}  props      Props applied to save element.
+				 * @param {WPBlock} blockType  Block type definition.
+				 * @param {Object}  attributes Block attributes.
+				 */
+				return applyFilters(
+					'blocks.getSaveContent.extraProps',
+					{ ...props },
+					blockType,
+					attributes
+				);
+			};
+		} else if ( isObject( element ) ) {
+			/**
+			 * Filters the props applied to the block save result element.
+			 *
+			 * @param {Object}  props      Props applied to save element.
+			 * @param {WPBlock} blockType  Block type definition.
+			 * @param {Object}  attributes Block attributes.
+			 */
+			const props = applyFilters(
+				'blocks.getSaveContent.extraProps',
+				{ ...element.props },
+				blockType,
+				attributes
+			);
 
-	if (
-		isObject( element ) &&
-		hasFilter( 'blocks.getSaveContent.extraProps' )
-	) {
-		/**
-		 * Filters the props applied to the block save result element.
-		 *
-		 * @param {Object}  props      Props applied to save element.
-		 * @param {WPBlock} blockType  Block type definition.
-		 * @param {Object}  attributes Block attributes.
-		 */
-		const props = applyFilters(
-			'blocks.getSaveContent.extraProps',
-			{ ...element.props },
-			blockType,
-			attributes
-		);
-
-		if ( ! isShallowEqual( props, element.props ) ) {
-			element = cloneElement( element, props );
+			if ( ! isShallowEqual( props, element.props ) ) {
+				element = cloneElement( element, props );
+			}
 		}
 	}
 
@@ -134,9 +158,11 @@ export function getSaveElement(
 	);
 
 	return (
-		<BlockContentProvider innerBlocks={ innerBlocks }>
-			{ element }
-		</BlockContentProvider>
+		<BlockPropsFilterContext.Provider value={ blockPropsFilter }>
+			<BlockContentProvider innerBlocks={ innerBlocks }>
+				{ element }
+			</BlockContentProvider>
+		</BlockPropsFilterContext.Provider>
 	);
 }