diff --git a/apps/web/.env.example b/apps/web/.env.example
index 1d0a026849..4aee774738 100644
--- a/apps/web/.env.example
+++ b/apps/web/.env.example
@@ -33,6 +33,7 @@ CRON_SECRET= # openssl rand -hex 32 -note: cron disabled if not set
 
 NEXT_PUBLIC_BYPASS_PREMIUM_CHECKS=true
 LOG_ZOD_ERRORS=true
+# WEBHOOK_URL=
 
 # =============================================================================
 # LLM Configuration - Uncomment ONE provider block
@@ -58,6 +59,7 @@ LOG_ZOD_ERRORS=true
 # ECONOMY_LLM_PROVIDER=openai
 # ECONOMY_LLM_MODEL=gpt-5-mini
 # OPENAI_API_KEY=
+# OPENAI_ZERO_DATA_RETENTION=
 
 # --- Google Vertex ---
 # DEFAULT_LLM_PROVIDER=google
diff --git a/apps/web/utils/llms/model.ts b/apps/web/utils/llms/model.ts
index 40a96d606c..d27072ec45 100644
--- a/apps/web/utils/llms/model.ts
+++ b/apps/web/utils/llms/model.ts
@@ -71,10 +71,11 @@ function selectModel(
       // When Zero Data Retention is enabled, set store: false to avoid
       // "Items are not persisted for Zero Data Retention organizations" errors
       // See: https://github.com/vercel/ai/issues/10060
+      const baseOptions = providerOptions ?? {};
       const openAiProviderOptions = env.OPENAI_ZERO_DATA_RETENTION
         ? {
-            ...providerOptions,
-            openai: { ...providerOptions?.openai, store: false },
+            ...baseOptions,
+            openai: { ...(baseOptions.openai ?? {}), store: false },
           }
         : providerOptions;
       return {
diff --git a/apps/web/utils/outlook/watch.ts b/apps/web/utils/outlook/watch.ts
index b139eaab19..8232b183a1 100644
--- a/apps/web/utils/outlook/watch.ts
+++ b/apps/web/utils/outlook/watch.ts
@@ -5,10 +5,7 @@ import { env } from "@/env";
 import { withOutlookRetry } from "@/utils/outlook/retry";
 
 export async function watchOutlook(client: Client) {
-  const base =
-    env.NODE_ENV === "development"
-      ? env.WEBHOOK_URL || env.NEXT_PUBLIC_BASE_URL
-      : env.NEXT_PUBLIC_BASE_URL;
+  const base = env.WEBHOOK_URL || env.NEXT_PUBLIC_BASE_URL;
 
   // must be https
   const notificationUrl = new URL("/api/outlook/webhook", base);
diff --git a/turbo.json b/turbo.json
index beffb3c649..f1598c9d32 100644
--- a/turbo.json
+++ b/turbo.json
@@ -32,6 +32,7 @@
         "OPENROUTER_BACKUP_MODEL",
 
         "OPENAI_API_KEY",
+        "OPENAI_ZERO_DATA_RETENTION",
         "ANTHROPIC_API_KEY",
         "BEDROCK_ACCESS_KEY",
         "BEDROCK_SECRET_KEY",
diff --git a/version.txt b/version.txt
index 31c10f212c..898347e92d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.21.36
+v2.21.37