diff --git a/packages/block-editor/src/components/block-edit/edit.js b/packages/block-editor/src/components/block-edit/edit.js
index 83d0e3f406f829..6b1ddd86f4c76e 100644
--- a/packages/block-editor/src/components/block-edit/edit.js
+++ b/packages/block-editor/src/components/block-edit/edit.js
@@ -18,6 +18,8 @@ import { useContext, useMemo } from '@wordpress/element';
  * Internal dependencies
  */
 import BlockContext from '../block-context';
+import { withBlockBindingsSupport } from './with-block-bindings-support';
+import { canBindBlock } from '../../utils/block-bindings';
 
 /**
  * Default value used for blocks which do not define their own context needs,
@@ -47,6 +49,8 @@ const Edit = ( props ) => {
 
 const EditWithFilters = withFilters( 'editor.BlockEdit' )( Edit );
 
+const EditWithFiltersAndBindings = withBlockBindingsSupport( EditWithFilters );
+
 const EditWithGeneratedProps = ( props ) => {
 	const { attributes = {}, name } = props;
 	const blockType = getBlockType( name );
@@ -67,8 +71,12 @@ const EditWithGeneratedProps = ( props ) => {
 		return null;
 	}
 
+	const EditComponent = canBindBlock( name )
+		? EditWithFiltersAndBindings
+		: EditWithFilters;
+
 	if ( blockType.apiVersion > 1 ) {
-		return <EditWithFilters { ...props } context={ context } />;
+		return <EditComponent { ...props } context={ context } />;
 	}
 
 	// Generate a class name for the block's editable form.
@@ -82,7 +90,7 @@ const EditWithGeneratedProps = ( props ) => {
 	);
 
 	return (
-		<EditWithFilters
+		<EditComponent
 			{ ...props }
 			context={ context }
 			className={ className }
diff --git a/packages/block-editor/src/components/block-edit/index.js b/packages/block-editor/src/components/block-edit/index.js
index a16385d694ffc8..0c29c0e98b1bfd 100644
--- a/packages/block-editor/src/components/block-edit/index.js
+++ b/packages/block-editor/src/components/block-edit/index.js
@@ -8,7 +8,6 @@ import { hasBlockSupport } from '@wordpress/blocks';
  * Internal dependencies
  */
 import Edit from './edit';
-import { withBlockBindingsSupport } from './with-block-bindings-support';
 import {
 	BlockEditContextProvider,
 	useBlockEditContext,
@@ -20,9 +19,6 @@ import {
 } from './context';
 import { MultipleUsageWarning } from './multiple-usage-warning';
 import { PrivateBlockContext } from '../block-list/private-block-context';
-import { canBindBlock } from '../../utils/block-bindings';
-
-const BlockEditWithBindings = withBlockBindingsSupport( Edit );
 
 /**
  * The `useBlockEditContext` hook provides information about the block this hook is being used in.
@@ -56,7 +52,6 @@ export default function BlockEdit( {
 		hasBlockSupport( name, 'layout', false ) ||
 		hasBlockSupport( name, '__experimentalLayout', false );
 	const { originalBlockClientId } = useContext( PrivateBlockContext );
-	const EditComponent = canBindBlock( name ) ? BlockEditWithBindings : Edit;
 
 	return (
 		<BlockEditContextProvider
@@ -93,7 +88,7 @@ export default function BlockEdit( {
 				]
 			) }
 		>
-			<EditComponent { ...props } />
+			<Edit { ...props } />
 			{ originalBlockClientId && (
 				<MultipleUsageWarning
 					originalBlockClientId={ originalBlockClientId }
diff --git a/packages/block-editor/src/components/block-edit/with-block-bindings-support.js b/packages/block-editor/src/components/block-edit/with-block-bindings-support.js
index 16cf92d2083026..0529c019b8deec 100644
--- a/packages/block-editor/src/components/block-edit/with-block-bindings-support.js
+++ b/packages/block-editor/src/components/block-edit/with-block-bindings-support.js
@@ -247,14 +247,12 @@ export const withBlockBindingsSupport = createHigherOrderComponent(
 		);
 
 		return (
-			<>
-				<BlockEdit
-					{ ...props }
-					attributes={ { ...props.attributes, ...boundAttributes } }
-					setAttributes={ _setAttributes }
-					context={ { ...context, ...updatedContext } }
-				/>
-			</>
+			<BlockEdit
+				{ ...props }
+				attributes={ { ...props.attributes, ...boundAttributes } }
+				setAttributes={ _setAttributes }
+				context={ { ...context, ...updatedContext } }
+			/>
 		);
 	},
 	'withBlockBindingSupport'