diff --git a/packages/console/app/src/routes/zen/util/handler.ts b/packages/console/app/src/routes/zen/util/handler.ts
index 7319295a67b..445bc369be1 100644
--- a/packages/console/app/src/routes/zen/util/handler.ts
+++ b/packages/console/app/src/routes/zen/util/handler.ts
@@ -238,6 +238,10 @@ export async function handler(
                 if (authInfo?.workspaceID) headers.set(k, authInfo.workspaceID)
                 return
               }
+              if (v === "$org") {
+                if (authInfo?.workspaceID) headers.set(k, authInfo.workspaceID.replace("wrk_", "org_"))
+                return
+              }
               headers.set(k, v)
             })
             headers.delete("host")