diff --git a/backend/btrixcloud/models.py b/backend/btrixcloud/models.py
index 7ab2aa757c..f81d01739a 100644
--- a/backend/btrixcloud/models.py
+++ b/backend/btrixcloud/models.py
@@ -2134,6 +2134,32 @@ class UserOut(UserOutNoId):
 
 # ============================================================================
 # ORGS
+# ============================================================================
+
+# Org field filters by access type
+ORG_CRAWLER_EXCLUDE_FIELDS = [
+    "users",
+    "quotaUpdates",
+    "webhookUrls",
+    "readOnlyReason",
+    "subscription",
+]
+
+ORG_VIEWER_EXCLUDE_FIELDS = [
+    *ORG_CRAWLER_EXCLUDE_FIELDS,
+    "usage",
+    "crawlExecSeconds",
+    "qaUsage",
+    "qaCrawlExecSeconds",
+    "monthlyExecSeconds",
+    "extraExecSeconds",
+    "giftedExecSeconds",
+    "quotas",
+    "allowSharedProxies",
+    "crawlingDefaults",
+]
+
+
 # ============================================================================
 class OrgReadOnlyOnCancel(BaseModel):
     """Make org readOnly on subscription cancellation instead of deleting"""
@@ -2348,14 +2374,13 @@ def _is_auth(self, user, value):
     async def serialize_for_user(self, user: User, user_manager) -> OrgOut:
         """Serialize result based on current user access"""
 
-        exclude = {"storage"}
+        exclude: list[str] = []
 
         if not self.is_owner(user):
-            exclude.add("users")
+            exclude = ORG_CRAWLER_EXCLUDE_FIELDS
 
         if not self.is_crawler(user):
-            exclude.add("usage")
-            exclude.add("crawlExecSeconds")
+            exclude = ORG_VIEWER_EXCLUDE_FIELDS
 
         result = self.to_dict(
             exclude_unset=True,