diff --git a/app/layout.tsx b/app/layout.tsx
index a4deb23..9fb6075 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -48,7 +48,7 @@ export default async function LocaleLayout({
   return (
     <html lang={locale} suppressHydrationWarning>
       <head>
-        <PublicEnvScript />
+        {!process.env.VERCEL && !process.env.CF_PAGES && <PublicEnvScript />}
         <link
           rel="stylesheet"
           href="https://cdn.jsdelivr.net/gh/lipis/flag-icons@7.0.0/css/flag-icons.min.css"
diff --git a/lib/env-entry.ts b/lib/env-entry.ts
index 258c632..0d9baf9 100644
--- a/lib/env-entry.ts
+++ b/lib/env-entry.ts
@@ -1,8 +1,12 @@
 import { env } from "next-runtime-env";
 
 export default function getEnv(key: string) {
-  if (key.startsWith("NEXT_PUBLIC_")) {
-    return env(key);
+  if (process.env.VERCEL || process.env.CF_PAGES) {
+    return process.env[key];
+  } else {
+    if (key.startsWith("NEXT_PUBLIC_")) {
+      return env(key);
+    }
+    return process.env[key];
   }
-  return process.env[key];
 }
