diff --git a/.changeset/curvy-horses-check.md b/.changeset/curvy-horses-check.md
new file mode 100644
index 00000000000..7e19faeb161
--- /dev/null
+++ b/.changeset/curvy-horses-check.md
@@ -0,0 +1,6 @@
+---
+"@atproto/ozone": patch
+"@atproto/api": patch
+---
+
+Limit tags filter to 25 max and remove 25 char limit for tag item
diff --git a/lexicons/tools/ozone/moderation/queryStatuses.json b/lexicons/tools/ozone/moderation/queryStatuses.json
index 641d01cac1b..a8ff110db84 100644
--- a/lexicons/tools/ozone/moderation/queryStatuses.json
+++ b/lexicons/tools/ozone/moderation/queryStatuses.json
@@ -130,9 +130,9 @@
           },
           "tags": {
             "type": "array",
+            "maxLength": 25,
             "items": {
               "type": "string",
-              "maxLength": 25,
               "description": "Items in this array are applied with OR filters. To apply AND filter, put all tags in the same string and separate using && characters"
             }
           },
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index c17d53bdd57..ef408e82ad0 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -12515,9 +12515,9 @@ export const schemaDict = {
             },
             tags: {
               type: 'array',
+              maxLength: 25,
               items: {
                 type: 'string',
-                maxLength: 25,
                 description:
                   'Items in this array are applied with OR filters. To apply AND filter, put all tags in the same string and separate using && characters',
               },
diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
index 63c34ee6e8c..7613b61fb4e 100644
--- a/packages/bsky/src/lexicon/index.ts
+++ b/packages/bsky/src/lexicon/index.ts
@@ -2177,13 +2177,13 @@ export class ChatBskyModerationNS {
 
 type SharedRateLimitOpts<T> = {
   name: string
-  calcKey?: (ctx: T) => string | null
+  calcKey?: (ctx: T) => string
   calcPoints?: (ctx: T) => number
 }
 type RouteRateLimitOpts<T> = {
   durationMs: number
   points: number
-  calcKey?: (ctx: T) => string | null
+  calcKey?: (ctx: T) => string
   calcPoints?: (ctx: T) => number
 }
 type HandlerOpts = { blobLimit?: number }
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index 951724c0fe9..cb526019090 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -2638,13 +2638,13 @@ export class ToolsOzoneTeamNS {
 
 type SharedRateLimitOpts<T> = {
   name: string
-  calcKey?: (ctx: T) => string | null
+  calcKey?: (ctx: T) => string
   calcPoints?: (ctx: T) => number
 }
 type RouteRateLimitOpts<T> = {
   durationMs: number
   points: number
-  calcKey?: (ctx: T) => string | null
+  calcKey?: (ctx: T) => string
   calcPoints?: (ctx: T) => number
 }
 type HandlerOpts = { blobLimit?: number }
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index c17d53bdd57..ef408e82ad0 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -12515,9 +12515,9 @@ export const schemaDict = {
             },
             tags: {
               type: 'array',
+              maxLength: 25,
               items: {
                 type: 'string',
-                maxLength: 25,
                 description:
                   'Items in this array are applied with OR filters. To apply AND filter, put all tags in the same string and separate using && characters',
               },
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index 951724c0fe9..cb526019090 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -2638,13 +2638,13 @@ export class ToolsOzoneTeamNS {
 
 type SharedRateLimitOpts<T> = {
   name: string
-  calcKey?: (ctx: T) => string | null
+  calcKey?: (ctx: T) => string
   calcPoints?: (ctx: T) => number
 }
 type RouteRateLimitOpts<T> = {
   durationMs: number
   points: number
-  calcKey?: (ctx: T) => string | null
+  calcKey?: (ctx: T) => string
   calcPoints?: (ctx: T) => number
 }
 type HandlerOpts = { blobLimit?: number }
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index c17d53bdd57..ef408e82ad0 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -12515,9 +12515,9 @@ export const schemaDict = {
             },
             tags: {
               type: 'array',
+              maxLength: 25,
               items: {
                 type: 'string',
-                maxLength: 25,
                 description:
                   'Items in this array are applied with OR filters. To apply AND filter, put all tags in the same string and separate using && characters',
               },