diff --git a/packages/edit-site/src/components/editor/index.js b/packages/edit-site/src/components/editor/index.js
index 08508ebd97344f..779b69cdeeef21 100644
--- a/packages/edit-site/src/components/editor/index.js
+++ b/packages/edit-site/src/components/editor/index.js
@@ -191,7 +191,7 @@ export default function EditSiteEditor( { isLoading } ) {
 						postWithTemplate ? contextPostType : editedPostType
 					}
 					postId={ postWithTemplate ? contextPostId : editedPostId }
-					templateId={ postWithTemplate ? contextPostId : undefined }
+					templateId={ postWithTemplate ? editedPostId : undefined }
 					settings={ settings }
 					className={ clsx( 'edit-site-editor__editor-interface', {
 						'show-icon-labels': showIconLabels,