diff --git a/apps/wpcom-block-editor/src/wpcom/features/live-preview/index.tsx b/apps/wpcom-block-editor/src/wpcom/features/live-preview/index.tsx
index 3da5972fea0eb..a65f7a4b9ed35 100644
--- a/apps/wpcom-block-editor/src/wpcom/features/live-preview/index.tsx
+++ b/apps/wpcom-block-editor/src/wpcom/features/live-preview/index.tsx
@@ -5,7 +5,6 @@ import { usePreviewingThemeSlug } from './hooks/use-previewing-theme';
import LivePreviewNoticePlugin from './live-preview-notice-plugin';
const LivePreviewPlugin = () => {
- const isReady = useSelect( ( select ) => select( 'core/editor' ).__unstableIsEditorReady() );
const siteEditorStore = useSelect( ( select ) => select( 'core/edit-site' ), [] );
const previewingThemeSlug = usePreviewingThemeSlug();
@@ -14,11 +13,6 @@ const LivePreviewPlugin = () => {
return null;
}
- // Don't render until the editor is ready
- if ( ! isReady ) {
- return null;
- }
-
// Don't render unless the user is previewing a theme.
if ( ! previewingThemeSlug ) {
return null;
diff --git a/apps/wpcom-block-editor/src/wpcom/features/live-preview/live-preview-notice-plugin.tsx b/apps/wpcom-block-editor/src/wpcom/features/live-preview/live-preview-notice-plugin.tsx
index a64b63ef029ec..981227a78aefd 100644
--- a/apps/wpcom-block-editor/src/wpcom/features/live-preview/live-preview-notice-plugin.tsx
+++ b/apps/wpcom-block-editor/src/wpcom/features/live-preview/live-preview-notice-plugin.tsx
@@ -53,6 +53,7 @@ const LivePreviewNotice: FC< {
};
const LivePreviewNoticePlugin = () => {
+ const isReady = useSelect( ( select ) => select( 'core/editor' ).__unstableIsEditorReady() );
const siteEditorStore = useSelect( ( select ) => select( 'core/edit-site' ), [] );
const previewingTheme = usePreviewingTheme();
const { canPreviewButNeedUpgrade, upgradePlan } = useCanPreviewButNeedUpgrade( previewingTheme );
@@ -72,7 +73,7 @@ const LivePreviewNoticePlugin = () => {
if ( canPreviewButNeedUpgrade ) {
return (
<>
-
+ { isReady && }
>
);