diff --git a/web/src/lib/diagnostics.ts b/web/src/lib/diagnostics.ts
index 63da04e..92be4ca 100644
--- a/web/src/lib/diagnostics.ts
+++ b/web/src/lib/diagnostics.ts
@@ -10,6 +10,14 @@ export function initDiagnostics() {
     return DiagnosticsClient.getInstance();
   }
 
+  const getAuthToken = () => {
+    if (typeof window === "undefined") {
+      return "";
+    }
+
+    return localStorage.getItem(`${PRODUCT_ID}_access_token`) ?? "";
+  };
+
   const client = DiagnosticsClient.getInstance({
     productId: PRODUCT_ID,
     anonymousInstallId: `${PRODUCT_ID}-web-install`,
@@ -20,6 +28,7 @@ export function initDiagnostics() {
     buildNumber: "1",
     releaseChannel: "dev",
     serverUrl: DIAGNOSTICS_URL,
+    getAuthToken,
     pollIntervalMs: 30000,
     captureConsole: false,
     captureErrors: true,
diff --git a/web/src/lib/product-config.ts b/web/src/lib/product-config.ts
index 2fdc18a..b3bbcdc 100644
--- a/web/src/lib/product-config.ts
+++ b/web/src/lib/product-config.ts
@@ -4,7 +4,10 @@ export const PRODUCT_NAME = process.env.NEXT_PUBLIC_PRODUCT_NAME ?? productIdent
 export const PRODUCT_ID = process.env.NEXT_PUBLIC_PRODUCT_ID ?? productIdentity.productId;
 export const PLATFORM_SERVICE_URL =
   process.env.NEXT_PUBLIC_PLATFORM_SERVICE_URL ?? "http://localhost:4003/api";
+export const PLATFORM_SERVICE_ORIGIN =
+  process.env.NEXT_PUBLIC_PLATFORM_SERVICE_ORIGIN ??
+  PLATFORM_SERVICE_URL.replace(/\/api\/?$/, "");
 export const NOTES_API_URL = process.env.NEXT_PUBLIC_NOTES_API_URL ?? "http://localhost:4016/api";
-export const DIAGNOSTICS_URL = process.env.NEXT_PUBLIC_DIAGNOSTICS_URL ?? "http://localhost:3000";
+export const DIAGNOSTICS_URL = process.env.NEXT_PUBLIC_DIAGNOSTICS_URL ?? PLATFORM_SERVICE_ORIGIN;
 export const TELEMETRY_TRANSPORT =
   process.env.NEXT_PUBLIC_TELEMETRY_TRANSPORT === "beacon" ? "beacon" : "fetch";