diff --git a/.changeset/pink-rules-promise.md b/.changeset/pink-rules-promise.md
new file mode 100644
index 0000000000..37f460744e
--- /dev/null
+++ b/.changeset/pink-rules-promise.md
@@ -0,0 +1,7 @@
+---
+"@comet/cms-admin": patch
+---
+
+Add loading state for edit `StackPage` in `PagesPage`
+
+Prevents flash of "Document not found" error message when reloading the page editor
diff --git a/packages/admin/cms-admin/src/pages/pagesPage/PagesPage.tsx b/packages/admin/cms-admin/src/pages/pagesPage/PagesPage.tsx
index caf23fe9ea..a50b8fb0ae 100644
--- a/packages/admin/cms-admin/src/pages/pagesPage/PagesPage.tsx
+++ b/packages/admin/cms-admin/src/pages/pagesPage/PagesPage.tsx
@@ -220,6 +220,10 @@ export function PagesPage({
                         {(selectedId) => {
                             const page = data?.pages.find((page) => page.id == selectedId);
 
+                            if (loading) {
+                                return <Loading behavior="fillPageHeight" />;
+                            }
+
                             if (!page) {
                                 return (
                                     <MainContent>