diff --git a/ui/src/components/InboxAgentPolicyControl.tsx b/ui/src/components/InboxAgentPolicyControl.tsx
index 2e321546bc4..7e080562730 100644
--- a/ui/src/components/InboxAgentPolicyControl.tsx
+++ b/ui/src/components/InboxAgentPolicyControl.tsx
@@ -108,7 +108,7 @@ export function InboxAgentPolicyControl({ companyId }: { companyId: string | nul
     );
   }
 
-  if (policyQuery.isLoading || !draft) {
+  if (policyQuery.isLoading || !policy || !draft) {
     return <div className="text-sm text-muted-foreground">Loading inbox agent policy…</div>;
   }