diff --git a/packages/edit-site/src/components/block-editor/index.js b/packages/edit-site/src/components/block-editor/index.js
index 3bcfbcda557405..702e1f3f6bfc35 100644
--- a/packages/edit-site/src/components/block-editor/index.js
+++ b/packages/edit-site/src/components/block-editor/index.js
@@ -74,16 +74,11 @@ export default function BlockEditor() {
 					( fillProps ) => (
 						<NavigateToLink
 							{ ...fillProps }
-							templateIds={ settings.templateIds }
 							activeId={ settings.templateId }
 							onActiveIdChange={ setActiveTemplateId }
 						/>
 					),
-					[
-						settings.templateIds,
-						settings.templateId,
-						setActiveTemplateId,
-					]
+					[ settings.templateId, setActiveTemplateId ]
 				) }
 			</__experimentalLinkControl.ViewerFill>
 			<Sidebar.InspectorFill>
diff --git a/packages/edit-site/src/components/navigate-to-link/index.js b/packages/edit-site/src/components/navigate-to-link/index.js
index 2b4e018bab1b51..50e72253b829e8 100644
--- a/packages/edit-site/src/components/navigate-to-link/index.js
+++ b/packages/edit-site/src/components/navigate-to-link/index.js
@@ -12,12 +12,7 @@ import { __ } from '@wordpress/i18n';
  */
 const { fetch } = window;
 
-export default function NavigateToLink( {
-	url,
-	templateIds,
-	activeId,
-	onActiveIdChange,
-} ) {
+export default function NavigateToLink( { url, activeId, onActiveIdChange } ) {
 	const [ templateId, setTemplateId ] = useState();
 	useEffect( () => {
 		const effect = async () => {
@@ -28,14 +23,14 @@ export default function NavigateToLink( {
 				if ( success ) {
 					let newTemplateId = data.ID;
 					if ( newTemplateId === null ) {
-						const { getEntityRecord } = select( 'core' );
-						newTemplateId = templateIds
-							.map( ( id ) =>
-								getEntityRecord( 'postType', 'wp_template', id )
-							)
-							.find(
-								( template ) => template.slug === data.post_name
-							).id;
+						const { getEntityRecords } = select( 'core' );
+						newTemplateId = getEntityRecords(
+							'postType',
+							'wp_template',
+							{
+								slug: data.post_name,
+							}
+						)[ 0 ].id;
 					}
 					setTemplateId( newTemplateId );
 				} else {
@@ -46,7 +41,7 @@ export default function NavigateToLink( {
 			}
 		};
 		effect();
-	}, [ url, templateIds ] );
+	}, [ url ] );
 	const onClick = useMemo( () => {
 		if ( ! templateId || templateId === activeId ) {
 			return null;