diff --git a/starters/basic-starter/pages/api/exit-preview.ts b/starters/basic-starter/pages/api/exit-preview.ts
index a8cf12e8..f8847b39 100644
--- a/starters/basic-starter/pages/api/exit-preview.ts
+++ b/starters/basic-starter/pages/api/exit-preview.ts
@@ -1,10 +1,9 @@
+import { drupal } from "@/lib/drupal"
 import type { NextApiRequest, NextApiResponse } from "next"
 
 export default async function exit(
-  _: NextApiRequest,
+  request: NextApiRequest,
   response: NextApiResponse
 ) {
-  response.clearPreviewData()
-  response.writeHead(307, { Location: "/" })
-  response.end()
+  await drupal.previewDisable(request, response)
 }
diff --git a/starters/basic-starter/pages/api/preview.ts b/starters/basic-starter/pages/api/preview.ts
index 7660eb64..a0733440 100644
--- a/starters/basic-starter/pages/api/preview.ts
+++ b/starters/basic-starter/pages/api/preview.ts
@@ -1,9 +1,10 @@
 import { drupal } from "@/lib/drupal"
 import type { NextApiRequest, NextApiResponse } from "next"
 
-export default async function handler(
+export default async function draft(
   request: NextApiRequest,
   response: NextApiResponse
 ) {
-  await drupal.preview(request, response)
+  // Enables Preview mode and Draft mode.
+  await drupal.preview(request, response, { enable: true })
 }
diff --git a/starters/graphql-starter/pages/api/exit-preview.ts b/starters/graphql-starter/pages/api/exit-preview.ts
index a8cf12e8..f8847b39 100644
--- a/starters/graphql-starter/pages/api/exit-preview.ts
+++ b/starters/graphql-starter/pages/api/exit-preview.ts
@@ -1,10 +1,9 @@
+import { drupal } from "@/lib/drupal"
 import type { NextApiRequest, NextApiResponse } from "next"
 
 export default async function exit(
-  _: NextApiRequest,
+  request: NextApiRequest,
   response: NextApiResponse
 ) {
-  response.clearPreviewData()
-  response.writeHead(307, { Location: "/" })
-  response.end()
+  await drupal.previewDisable(request, response)
 }
diff --git a/starters/graphql-starter/pages/api/preview.ts b/starters/graphql-starter/pages/api/preview.ts
index 7660eb64..a0733440 100644
--- a/starters/graphql-starter/pages/api/preview.ts
+++ b/starters/graphql-starter/pages/api/preview.ts
@@ -1,9 +1,10 @@
 import { drupal } from "@/lib/drupal"
 import type { NextApiRequest, NextApiResponse } from "next"
 
-export default async function handler(
+export default async function draft(
   request: NextApiRequest,
   response: NextApiResponse
 ) {
-  await drupal.preview(request, response)
+  // Enables Preview mode and Draft mode.
+  await drupal.preview(request, response, { enable: true })
 }