diff --git a/packages/block-editor/src/components/inner-blocks/index.js b/packages/block-editor/src/components/inner-blocks/index.js
index 957e9fa60a3f41..057cded0852322 100644
--- a/packages/block-editor/src/components/inner-blocks/index.js
+++ b/packages/block-editor/src/components/inner-blocks/index.js
@@ -150,7 +150,7 @@ const ForwardedInnerBlocks = forwardRef( ( props, ref ) => {
  * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/inner-blocks/README.md
  */
 export function useInnerBlocksProps( props = {}, options = {} ) {
-	const { __experimentalLayout } = options;
+	const { __unstableNoLayoutClassNames } = options;
 	const { clientId, __unstableLayoutClassNames: layoutClassNames = '' } =
 		useBlockEditContext();
 	const isSmallScreen = useViewportMatch( 'medium', '<' );
@@ -209,9 +209,9 @@ export function useInnerBlocksProps( props = {}, options = {} ) {
 		className: classnames(
 			props.className,
 			'block-editor-block-list__layout',
+			__unstableNoLayoutClassNames ? '' : layoutClassNames,
 			{
 				'has-overlay': hasOverlay,
-				[ layoutClassNames ]: __experimentalLayout,
 			}
 		),
 		children: clientId ? (
diff --git a/packages/block-library/src/group/edit.js b/packages/block-library/src/group/edit.js
index f4b69bcbf68fe1..7d527819927a97 100644
--- a/packages/block-library/src/group/edit.js
+++ b/packages/block-library/src/group/edit.js
@@ -74,6 +74,7 @@ function GroupEdit( {
 				? undefined
 				: InnerBlocks.ButtonBlockAppender,
 			__experimentalLayout: layoutSupportEnabled ? usedLayout : undefined,
+			__unstableNoLayoutClassNames: ! layoutSupportEnabled,
 		}
 	);