diff --git a/apps/landing-page/next.config.js b/apps/landing-page/next.config.js
index 01432614bae..7eefc693d07 100644
--- a/apps/landing-page/next.config.js
+++ b/apps/landing-page/next.config.js
@@ -3,14 +3,6 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
   enabled: process.env.ANALYZE === 'true',
 })
 
-const pages = [
-  'pricing',
-  'privacy-policies',
-  'terms-of-service',
-  'about',
-  'oss-friends',
-]
-
 module.exports = withBundleAnalyzer({
   transpilePackages: ['utils', 'models'],
   async redirects() {
@@ -28,36 +20,4 @@ module.exports = withBundleAnalyzer({
       },
     ]
   },
-  async rewrites() {
-    return {
-      beforeFiles: [
-        {
-          source: '/_next/static/:static*',
-          destination:
-            process.env.NEXT_PUBLIC_VIEWER_URL + '/_next/static/:static*',
-          has: [
-            {
-              type: 'header',
-              key: 'referer',
-              value:
-                process.env.LANDING_PAGE_HOST +
-                '/(?!' +
-                pages.join('|') +
-                '|\\?).+',
-            },
-          ],
-        },
-      ],
-      fallback: [
-        {
-          source: '/:typebotId*',
-          destination: process.env.NEXT_PUBLIC_VIEWER_URL + '/:typebotId*',
-        },
-        {
-          source: '/api/:path*',
-          destination: process.env.NEXT_PUBLIC_VIEWER_URL + '/api/:path*',
-        },
-      ],
-    }
-  },
 })
diff --git a/apps/viewer/next.config.js b/apps/viewer/next.config.js
index 5f950590cde..2154d0023a7 100644
--- a/apps/viewer/next.config.js
+++ b/apps/viewer/next.config.js
@@ -1,6 +1,15 @@
 const { withSentryConfig } = require('@sentry/nextjs')
 const path = require('path')
 
+const landingPagePaths = [
+  '/',
+  '/pricing',
+  '/privacy-policies',
+  '/terms-of-service',
+  '/about',
+  '/oss-friends',
+]
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
@@ -14,13 +23,59 @@ const nextConfig = {
     outputFileTracingRoot: path.join(__dirname, '../../'),
   },
   async rewrites() {
-    return [
-      {
+    return {
+      beforeFiles: (process.env.LANDING_PAGE_URL
+        ? landingPagePaths
+            .map((path) => ({
+              source: '/_next/static/:static*',
+              destination: `${process.env.LANDING_PAGE_URL}/_next/static/:static*`,
+              has: [
+                {
+                  type: 'header',
+                  key: 'referer',
+                  value: `${process.env.NEXT_PUBLIC_VIEWER_URL}${path}`,
+                },
+              ],
+            }))
+            .concat(
+              landingPagePaths.map((path) => ({
+                source: '/typebots/:typebot*',
+                destination: `${process.env.LANDING_PAGE_URL}/typebots/:typebot*`,
+                has: [
+                  {
+                    type: 'header',
+                    key: 'referer',
+                    value: `${process.env.NEXT_PUBLIC_VIEWER_URL}${path}`,
+                  },
+                ],
+              }))
+            )
+            .concat(
+              landingPagePaths.map((path) => ({
+                source: '/styles/:style*',
+                destination: `${process.env.LANDING_PAGE_URL}/styles/:style*`,
+                has: [
+                  {
+                    type: 'header',
+                    key: 'referer',
+                    value: `${process.env.NEXT_PUBLIC_VIEWER_URL}${path}`,
+                  },
+                ],
+              }))
+            )
+            .concat(
+              landingPagePaths.map((path) => ({
+                source: path,
+                destination: `${process.env.LANDING_PAGE_URL}${path}`,
+              }))
+            )
+        : []
+      ).concat({
         source: '/api/typebots/:typebotId/blocks/:blockId/storage/upload-url',
         destination:
           '/api/v1/typebots/:typebotId/blocks/:blockId/storage/upload-url',
-      },
-    ]
+      }),
+    }
   },
 }