diff --git a/apps/sim/hooks/kb/use-knowledge-base-tag-definitions.ts b/apps/sim/hooks/kb/use-knowledge-base-tag-definitions.ts
index 1a90410bbb2..5ca10cbf7c5 100644
--- a/apps/sim/hooks/kb/use-knowledge-base-tag-definitions.ts
+++ b/apps/sim/hooks/kb/use-knowledge-base-tag-definitions.ts
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback } from 'react'
+import { useCallback, useMemo } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
 import type { AllTagSlot } from '@/lib/knowledge/constants'
 import { knowledgeKeys, useTagDefinitionsQuery } from '@/hooks/queries/kb/knowledge'
@@ -29,8 +29,10 @@ export function useKnowledgeBaseTagDefinitions(knowledgeBaseId: string | null) {
     })
   }, [queryClient, knowledgeBaseId])
 
+  const tagDefinitions = useMemo(() => (query.data ?? []) as TagDefinition[], [query.data])
+
   return {
-    tagDefinitions: (query.data ?? []) as TagDefinition[],
+    tagDefinitions,
     isLoading: query.isLoading,
     error: query.error instanceof Error ? query.error.message : null,
     fetchTagDefinitions,
diff --git a/apps/sim/hooks/kb/use-tag-definitions.ts b/apps/sim/hooks/kb/use-tag-definitions.ts
index f328c5f57d6..19e6efee8ac 100644
--- a/apps/sim/hooks/kb/use-tag-definitions.ts
+++ b/apps/sim/hooks/kb/use-tag-definitions.ts
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback } from 'react'
+import { useCallback, useMemo } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
 import type { AllTagSlot } from '@/lib/knowledge/constants'
 import {
@@ -40,7 +40,7 @@ export function useTagDefinitions(
   const { mutateAsync: saveTagDefinitionsMutation } = useSaveDocumentTagDefinitions()
   const { mutateAsync: deleteTagDefinitionsMutation } = useDeleteDocumentTagDefinitions()
 
-  const tagDefinitions = (query.data ?? []) as TagDefinition[]
+  const tagDefinitions = useMemo(() => (query.data ?? []) as TagDefinition[], [query.data])
 
   const fetchTagDefinitions = useCallback(async () => {
     if (!knowledgeBaseId || !documentId) return