diff --git a/app/layout.tsx b/app/layout.tsx
index 1962c32..bf028fc 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
 import { Analytics } from "@vercel/analytics/react";
+import { GoogleAnalytics } from "@next/third-parties/google";
 import { DiagramProvider } from "@/contexts/diagram-context";
 
 import "./globals.css";
@@ -96,6 +97,9 @@ export default function RootLayout({
 
                 <Analytics />
             </body>
+            {process.env.NEXT_PUBLIC_GA_ID && (
+                <GoogleAnalytics gaId={process.env.NEXT_PUBLIC_GA_ID} />
+            )}
         </html>
     );
 }
diff --git a/package-lock.json b/package-lock.json
index a382552..fc04a0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
                 "@ai-sdk/google": "^2.0.0",
                 "@ai-sdk/openai": "^2.0.19",
                 "@ai-sdk/react": "^2.0.22",
+                "@next/third-parties": "^16.0.6",
                 "@openrouter/ai-sdk-provider": "^1.2.3",
                 "@radix-ui/react-dialog": "^1.1.6",
                 "@radix-ui/react-scroll-area": "^1.2.3",
@@ -1747,6 +1748,19 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/@next/third-parties": {
+            "version": "16.0.6",
+            "resolved": "https://registry.npmjs.org/@next/third-parties/-/third-parties-16.0.6.tgz",
+            "integrity": "sha512-yYZkmgc3YuMsvouklk3R3oDEmzq1rEiEm/5wGHjTfyTCsRrrD3jBX84xrMtEN7vVWbWXXWbV0SZ5TfkgeMLGWg==",
+            "license": "MIT",
+            "dependencies": {
+                "third-party-capital": "1.0.20"
+            },
+            "peerDependencies": {
+                "next": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0-beta.0",
+                "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0"
+            }
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -8752,6 +8766,12 @@
                 "node": ">=6"
             }
         },
+        "node_modules/third-party-capital": {
+            "version": "1.0.20",
+            "resolved": "https://registry.npmjs.org/third-party-capital/-/third-party-capital-1.0.20.tgz",
+            "integrity": "sha512-oB7yIimd8SuGptespDAZnNkzIz+NWaJCu2RMsbs4Wmp9zSDUM8Nhi3s2OOcqYuv3mN4hitXc8DVx+LyUmbUDiA==",
+            "license": "ISC"
+        },
         "node_modules/throttleit": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-2.1.0.tgz",
diff --git a/package.json b/package.json
index dbf0258..47c33c3 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
         "@ai-sdk/google": "^2.0.0",
         "@ai-sdk/openai": "^2.0.19",
         "@ai-sdk/react": "^2.0.22",
+        "@next/third-parties": "^16.0.6",
         "@openrouter/ai-sdk-provider": "^1.2.3",
         "@radix-ui/react-dialog": "^1.1.6",
         "@radix-ui/react-scroll-area": "^1.2.3",