diff --git a/packages/block-editor/src/components/block-controls/hook.js b/packages/block-editor/src/components/block-controls/hook.js
index 0d8f20bfd1428a..d907a9aad5c364 100644
--- a/packages/block-editor/src/components/block-controls/hook.js
+++ b/packages/block-editor/src/components/block-controls/hook.js
@@ -25,7 +25,7 @@ export default function useBlockControlsFill( group, exposeToChildren ) {
 				exposeToChildren &&
 				hasBlockSupport(
 					getBlockName( clientId ),
-					'__experimentalCaptureToolbars',
+					'__experimentalExposeControlsToChildren',
 					false
 				) &&
 				hasSelectedInnerBlock( clientId )
diff --git a/packages/block-editor/src/components/inner-blocks/index.js b/packages/block-editor/src/components/inner-blocks/index.js
index f86e77acdb4756..dcf07e7391fc8b 100644
--- a/packages/block-editor/src/components/inner-blocks/index.js
+++ b/packages/block-editor/src/components/inner-blocks/index.js
@@ -144,7 +144,7 @@ export function useInnerBlocksProps( props = {}, options = {} ) {
 	const { __experimentalCaptureToolbars, hasOverlay } = useSelect(
 		( select ) => {
 			if ( ! clientId ) {
-				return;
+				return {};
 			}
 
 			const {
@@ -160,7 +160,7 @@ export function useInnerBlocksProps( props = {}, options = {} ) {
 					blocksStore
 				).hasBlockSupport(
 					blockName,
-					'__experimentalCaptureToolbars',
+					'__experimentalExposeControlsToChildren',
 					false
 				),
 				hasOverlay:
diff --git a/packages/block-library/src/buttons/block.json b/packages/block-library/src/buttons/block.json
index a055e03a1ec3bb..dcd9519af1a103 100644
--- a/packages/block-library/src/buttons/block.json
+++ b/packages/block-library/src/buttons/block.json
@@ -18,7 +18,7 @@
 	"supports": {
 		"anchor": true,
 		"align": [ "wide", "full" ],
-		"__experimentalCaptureToolbars": true
+		"__experimentalExposeControlsToChildren": true
 	},
 	"editorStyle": "wp-block-buttons-editor",
 	"style": "wp-block-buttons"
diff --git a/packages/block-library/src/social-links/block.json b/packages/block-library/src/social-links/block.json
index adbbd3f5774365..73ac6142c7042e 100644
--- a/packages/block-library/src/social-links/block.json
+++ b/packages/block-library/src/social-links/block.json
@@ -41,7 +41,7 @@
 	"supports": {
 		"align": [ "left", "center", "right" ],
 		"anchor": true,
-		"__experimentalCaptureToolbars": true
+		"__experimentalExposeControlsToChildren": true
 	},
 	"styles": [
 		{ "name": "default", "label": "Default", "isDefault": true },