diff --git a/env/schema.mjs b/env/schema.mjs
index 3f6785e79..5e9fd5895 100644
--- a/env/schema.mjs
+++ b/env/schema.mjs
@@ -10,8 +10,8 @@ export const serverSchema = z.object({
   CMS_API_KEY: z.string(),
   CMS_ENVIRONMENT: z.enum(["development", "production", "staging", "test"]),
   CMS_URL: z.string(),
-  CMS_PREVIEW_URL: z.string(),
-  CMS_PREVIEW_TOKEN: z.string(),
+  CMS_PREVIEW_URL: z.string().optional(),
+  CMS_PREVIEW_TOKEN: z.string().optional(),
   NODE_ENV: z.enum(["development", "test", "production"]),
   PRINT_QUERY: z.boolean().default(false),
 });
diff --git a/lib/graphql/Query/CurrentBlockPage.graphql b/lib/graphql/Query/CurrentBlockPage.graphql
index 55f86801a..dfc087b35 100644
--- a/lib/graphql/Query/CurrentBlockPage.graphql
+++ b/lib/graphql/Query/CurrentBlockPage.graphql
@@ -28,6 +28,10 @@ query GetCurrentBlockPage($locale: String!, $url: String!) {
       ...Preamble
       title
       url
+      system {
+        uid
+        content_type_uid
+      }
     }
     total
   }
diff --git a/middleware.ts b/middleware.ts
index aa5e7bec9..f2bee7ba4 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -37,6 +37,7 @@ export async function middleware(request: NextRequest) {
   searchParams.set("uri", pathNameWithoutLocale);
 
   if (request.nextUrl.pathname.includes("preview")) {
+    console.log("IN PREVIEW! Search params: ", request.nextUrl.searchParams);
     if (request.nextUrl.searchParams.get("hash")) {
       ContentstackLivePreview.setConfigFromParams(request.nextUrl.searchParams);