diff --git a/.changeset/evil-dogs-shine.md b/.changeset/evil-dogs-shine.md
new file mode 100644
index 000000000..a255a5633
--- /dev/null
+++ b/.changeset/evil-dogs-shine.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Remove `await connection()` workaround on 404 pages
diff --git a/core/lib/makeswift/page.tsx b/core/lib/makeswift/page.tsx
index c67538fb7..7e1d45344 100644
--- a/core/lib/makeswift/page.tsx
+++ b/core/lib/makeswift/page.tsx
@@ -1,5 +1,4 @@
 import { notFound } from 'next/navigation';
-import { connection } from 'next/server';
 
 import { getPageSnapshot } from './client';
 import { MakeswiftPageShim } from './makeswift-page-shim';
@@ -8,9 +7,6 @@ export async function Page({ path, locale }: { path: string; locale: string }) {
   const snapshot = await getPageSnapshot({ path, locale });
 
   if (snapshot == null) {
-    // This is a temporary solution to fix the issue where non-published pages are not editable in the builder.
-    await connection();
-
     return notFound();
   }