diff --git a/.vscode/settings.json b/.vscode/settings.json
index 567bb9d8e3..e34b03f958 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -148,6 +148,7 @@
     "Grantsville",
     "Greendale",
     "GSTC",
+    "gtag",
     "Guestblog",
     "Gunnison",
     "HAFB",
diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro
index 27a63afbe6..a00de0552f 100644
--- a/src/components/BaseHead.astro
+++ b/src/components/BaseHead.astro
@@ -1,4 +1,6 @@
 ---
+import type { ImageMetadata } from 'astro';
+
 import GoogleAnalytics from '@components/page/GoogleAnalytics.astro';
 
 interface Props {
@@ -44,4 +46,4 @@ const { title, description, image = '/default-social-card.png' } = Astro.props;
 <meta property="twitter:description" content={description} />
 <meta property="twitter:image" content={new URL(typeof image === 'string' ? image : image.src, Astro.url)} />
 
-<GoogleAnalytics id={GA_ID} />
+{import.meta.env.PROD && (<GoogleAnalytics id={GA_ID} />)}
diff --git a/src/components/page/GoogleAnalytics.astro b/src/components/page/GoogleAnalytics.astro
index 73d3807468..a9b22bb4d6 100644
--- a/src/components/page/GoogleAnalytics.astro
+++ b/src/components/page/GoogleAnalytics.astro
@@ -5,14 +5,23 @@ type Props = {
 
 const { id } = Astro.props;
 ---
-
+<script is:inline>
+  partytown = {
+    forward: [
+            'dataLayer.push',
+            'analytics.track',
+            'analytics.identify',
+            'analytics.group',
+            'analytics.reset',
+            'analytics.user',
+            'analytics.alias',
+          ]
+  };
+</script>
 <script type="text/partytown" is:inline async src={`https://www.googletagmanager.com/gtag/js?id=${id}`}></script>
 <script type="text/partytown" is:inline define:vars={{ id }}>
   window.dataLayer = window.dataLayer || [];
-  function gtag() {
-    dataLayer.push(arguments);
-  }
-  gtag('js', new Date());
-
-  gtag('config', id);
+  window.gtag = () => window.dataLayer.push(arguments);
+  window.gtag('js', new Date())
+  window.gtag('config', id);
 </script>