diff --git a/apps/mail/hooks/use-labels.ts b/apps/mail/hooks/use-labels.ts
index 3969b7601b..4e840a4ba6 100644
--- a/apps/mail/hooks/use-labels.ts
+++ b/apps/mail/hooks/use-labels.ts
@@ -2,6 +2,16 @@ import { useTRPC } from '@/providers/query-provider';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
 
+const desiredSystemLabels = new Set([
+  'IMPORTANT',
+  'FORUMS',
+  'PROMOTIONS',
+  'SOCIAL',
+  'UPDATES',
+  'STARRED',
+  'UNREAD',
+]);
+
 export function useLabels() {
   const trpc = useTRPC();
   const labelQuery = useQuery(
@@ -12,9 +22,18 @@ export function useLabels() {
 
   const { userLabels, systemLabels } = useMemo(() => {
     if (!labelQuery.data) return { userLabels: [], systemLabels: [] };
+    const cleanedName = labelQuery.data
+      .filter((label) => label.type === 'system')
+      .map((label) => {
+        return {
+          ...label,
+          name: label.name.replace('CATEGORY_', ''),
+        };
+      });
+    const cleanedSystemLabels = cleanedName.filter((label) => desiredSystemLabels.has(label.name));
     return {
       userLabels: labelQuery.data.filter((label) => label.type === 'user'),
-      systemLabels: labelQuery.data.filter((label) => label.type === 'system'),
+      systemLabels: cleanedSystemLabels,
     };
   }, [labelQuery.data]);
 
diff --git a/apps/server/wrangler.jsonc b/apps/server/wrangler.jsonc
index 16ea126b5f..2ddf4047e1 100644
--- a/apps/server/wrangler.jsonc
+++ b/apps/server/wrangler.jsonc
@@ -78,10 +78,6 @@
           "tag": "v3",
           "new_classes": ["ZeroDB"],
         },
-        {
-          "tag": "v4",
-          "new_sqlite_classes": ["ZeroAgent"],
-        },
       ],
 
       "observability": {
@@ -215,10 +211,6 @@
           "tag": "v3",
           "new_classes": ["ZeroDB"],
         },
-        {
-          "tag": "v4",
-          "new_sqlite_classes": ["ZeroAgent"],
-        },
       ],
       "observability": {
         "enabled": true,
@@ -354,10 +346,6 @@
           "tag": "v3",
           "new_classes": ["ZeroDB"],
         },
-        {
-          "tag": "v4",
-          "new_sqlite_classes": ["ZeroAgent"],
-        },
       ],
       "vars": {
         "NODE_ENV": "production",