From e9bced2478db287d1b45d9f8ce02b1551663d147 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Thu, 13 Feb 2025 14:34:15 +0800
Subject: [PATCH] Relocate some checks

---
 packages/editor/src/components/provider/index.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index 4e8d23188b0b10..0e653228fee628 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -204,15 +204,14 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 				const hasDefaultMode = RENDERING_MODES.includes( _defaultMode );
 
 				// Wait for template resolution when rendering in a `template-locked` mode.
-				const canRenderDefaultMode =
-					_defaultMode === 'template-locked' ? hasTemplate : true;
+				const hasResolvedMode =
+					hasLoadedPostObject && _defaultMode === 'template-locked'
+						? hasTemplate
+						: true;
 
 				return {
 					editorSettings: getEditorSettings(),
-					isReady:
-						__unstableIsEditorReady() &&
-						hasLoadedPostObject &&
-						canRenderDefaultMode,
+					isReady: __unstableIsEditorReady() && hasResolvedMode,
 					mode: getRenderingMode(),
 					defaultMode: hasDefaultMode ? _defaultMode : 'post-only',
 					selection: getEditorSelection(),