diff --git a/src/app.d.ts b/src/app.d.ts
index 631d9c9c..8ffdbda3 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -7,7 +7,9 @@ import type { ISbStoryData } from '@storyblok/js';
 declare global {
   namespace App {
     // interface Error {}
-    // interface Locals {}
+    interface Locals {
+      version: 'published' | 'draft';
+    }
     interface PageData {
       awards: ISbStoryData<RecognitionEntryStoryblok>[];
     }
diff --git a/src/components/draft-mode.svelte b/src/components/draft-mode.svelte
index b80bd670..0dd7ce82 100644
--- a/src/components/draft-mode.svelte
+++ b/src/components/draft-mode.svelte
@@ -22,6 +22,7 @@
     <Button
       as="a"
       data-sveltekit-preload-data="off"
+      data-sveltekit-reload
       href="/exit-preview?return_to={encodeURIComponent($page.url.pathname)}"
     >
       Published version
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
new file mode 100644
index 00000000..63e46028
--- /dev/null
+++ b/src/hooks.server.ts
@@ -0,0 +1,17 @@
+import { PREVIEW_COOKIE_KEY } from '$lib/constants';
+import { sequence } from '@sveltejs/kit/hooks';
+import type { Handle } from '@sveltejs/kit';
+
+const validateDraftMode: Handle = async ({ event, resolve }) => {
+  event.locals.version = event.cookies.get(PREVIEW_COOKIE_KEY) ? 'draft' : 'published';
+
+  const response = await resolve(event);
+  // Note: https://www.storyblok.com/docs/guide/essentials/visual-editor#visual-editor-preview
+  if (event.locals.version === 'draft') {
+    response.headers.set('X-Frame-Options', 'ALLOW-FROM storyblok.com');
+  }
+
+  return response;
+};
+
+export const handle = sequence(validateDraftMode);
diff --git a/src/routes/(handbook)/+layout.server.ts b/src/routes/(handbook)/+layout.server.ts
index c3fea5fb..38e2c151 100644
--- a/src/routes/(handbook)/+layout.server.ts
+++ b/src/routes/(handbook)/+layout.server.ts
@@ -1,12 +1,11 @@
-import { PREVIEW_COOKIE_KEY } from '$lib/constants';
 import { getStoryblok } from '$lib/storyblok';
 import type { ConfigurationStoryblok } from '$types/bloks';
 import { error } from '@sveltejs/kit';
 import type { ISbStoryData } from '@storyblok/js';
 import { fetchCareers } from '$lib/content';
 
-export const load = async ({ cookies, fetch }) => {
-  const version: 'draft' | 'published' = cookies.get(PREVIEW_COOKIE_KEY) ? 'draft' : 'published';
+export const load = async ({ fetch, locals }) => {
+  const version = locals.version;
   const storyblok = getStoryblok({ fetch });
 
   try {
diff --git a/src/routes/(marketing-site)/+layout.server.ts b/src/routes/(marketing-site)/+layout.server.ts
index 996846e7..eb0a806c 100644
--- a/src/routes/(marketing-site)/+layout.server.ts
+++ b/src/routes/(marketing-site)/+layout.server.ts
@@ -1,12 +1,11 @@
-import { PREVIEW_COOKIE_KEY } from '$lib/constants';
 import { getStoryblok } from '$lib/storyblok';
 import type { ConfigurationStoryblok } from '$types/bloks';
 import { error } from '@sveltejs/kit';
 import type { ISbStoryData } from '@storyblok/js';
 import { fetchAwards, fetchAwardsTypes, fetchCareers } from '$lib/content';
 
-export const load = async ({ cookies, fetch }) => {
-  const version: 'draft' | 'published' = cookies.get(PREVIEW_COOKIE_KEY) ? 'draft' : 'published';
+export const load = async ({ locals, fetch }) => {
+  const version = locals.version;
   const storyblok = getStoryblok({ fetch });
 
   try {
diff --git a/src/routes/(marketing-site)/[...path]/+page.server.ts b/src/routes/(marketing-site)/[...path]/+page.server.ts
index 94e00363..3a5c37c5 100644
--- a/src/routes/(marketing-site)/[...path]/+page.server.ts
+++ b/src/routes/(marketing-site)/[...path]/+page.server.ts
@@ -1,16 +1,16 @@
 import { error } from '@sveltejs/kit';
-import { PREVIEW_COOKIE_KEY } from '$lib/constants';
 import { fetchPage } from '$lib/content';
 import { BYPASS_TOKEN } from '$env/static/private';
 
-export const load = async ({ params, cookies, fetch, url }) => {
+export const load = async ({ params, locals, fetch, url }) => {
+  const version = locals.version;
   // don't catch paths that end with an extension
   if (/\..+$/.test(params.path)) throw error(404);
 
   try {
     const page = await fetchPage({
       slug: params.path,
-      version: cookies.get(PREVIEW_COOKIE_KEY) ? 'draft' : 'published',
+      version,
       fetch,
       url
     });
diff --git a/src/routes/(proposals)/proposal/[slug]/+page.server.ts b/src/routes/(proposals)/proposal/[slug]/+page.server.ts
index 7d007ee7..1af95426 100644
--- a/src/routes/(proposals)/proposal/[slug]/+page.server.ts
+++ b/src/routes/(proposals)/proposal/[slug]/+page.server.ts
@@ -1,5 +1,4 @@
 import { STORYBLOK_PROPOSALS_TOKEN } from '$env/static/private';
-import { PREVIEW_COOKIE_KEY } from '$lib/constants';
 import { getStoryblok } from '$lib/storyblok';
 import { fetchAwards, fetchPage } from '$lib/content';
 import type { ProposalStoryblok } from '$types/bloks.js';
@@ -13,8 +12,8 @@ const isStatusError = (err: unknown): err is { status: number } => {
   );
 };
 
-export const load = async ({ cookies, fetch, params, url }) => {
-  const version: 'draft' | 'published' = cookies.get(PREVIEW_COOKIE_KEY) ? 'draft' : 'published';
+export const load = async ({ locals, cookies, fetch, params, url }) => {
+  const version = locals.version;
 
   const storyblok = getStoryblok({ fetch }, { accessToken: STORYBLOK_PROPOSALS_TOKEN });