diff --git a/src/components/Analytics.astro b/src/components/Analytics.astro
index 7b8d0e2..d90978b 100644
--- a/src/components/Analytics.astro
+++ b/src/components/Analytics.astro
@@ -2,7 +2,7 @@
 const gaId = import.meta.env.PUBLIC_GA_ID;
 const clarityId = import.meta.env.PUBLIC_CLARITY_ID;
 
-const isProd = import.meta.env.MODE === "production";
+const isProd = import.meta.env.PROD;
 ---
 
 {isProd && gaId && (
@@ -15,13 +15,15 @@ const isProd = import.meta.env.MODE === "production";
       function gtag(){dataLayer.push(arguments);}
 
       gtag('js', new Date());
-      gtag('config', "${gaId}");
+      gtag('config', "{gaId}");
     </script>
   </>
 )}
 
 {isProd && clarityId && (
   <script is:inline>
+    const CLARITY_ID = "{clarityId}";
+
     (function(c,l,a,r,i,t,y){
       c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
       t=l.createElement(r);
@@ -29,6 +31,6 @@ const isProd = import.meta.env.MODE === "production";
       t.src="https://www.clarity.ms/tag/"+i;
       y=l.getElementsByTagName(r)[0];
       y.parentNode.insertBefore(t,y);
-    })(window, document, "clarity", "script", clarityId);
+    })(window, document, "clarity", "script", CLARITY_ID);
   </script>
 )}
\ No newline at end of file