diff --git a/web-app/src/providers/AuthProvider.tsx b/web-app/src/providers/AuthProvider.tsx
index a62ea4fdd..733296dd4 100644
--- a/web-app/src/providers/AuthProvider.tsx
+++ b/web-app/src/providers/AuthProvider.tsx
@@ -31,19 +31,10 @@ export function AuthProvider({ children }: AuthProviderProps) {
   const fetchUserData = useCallback(async () => {
     try {
       const { setThreads } = useThreads.getState()
-      const { setMessages } = useMessages.getState()
 
       // Fetch threads first
       const threads = await serviceHub.threads().fetchThreads()
       setThreads(threads)
-
-      // Fetch messages for each thread
-      const messagePromises = threads.map(async (thread) => {
-        const messages = await serviceHub.messages().fetchMessages(thread.id)
-        setMessages(thread.id, messages)
-      })
-
-      await Promise.all(messagePromises)
     } catch (error) {
       console.error('Failed to fetch user data:', error)
     }
diff --git a/web-app/src/providers/DataProvider.tsx b/web-app/src/providers/DataProvider.tsx
index b8c928485..333bd2eec 100644
--- a/web-app/src/providers/DataProvider.tsx
+++ b/web-app/src/providers/DataProvider.tsx
@@ -1,4 +1,3 @@
-import { useMessages } from '@/hooks/useMessages'
 import { useModelProvider } from '@/hooks/useModelProvider'
 
 import { useAppUpdater } from '@/hooks/useAppUpdater'
@@ -19,7 +18,6 @@ export function DataProvider() {
   const { setProviders, selectedModel, selectedProvider, getProviderByName } =
     useModelProvider()
 
-  const { setMessages } = useMessages()
   const { checkForUpdate } = useAppUpdater()
   const { setServers } = useMCPServers()
   const { setAssistants, initializeWithLastUsed } = useAssistant()
@@ -87,14 +85,8 @@ export function DataProvider() {
       .fetchThreads()
       .then((threads) => {
         setThreads(threads)
-        threads.forEach((thread) =>
-          serviceHub
-            .messages()
-            .fetchMessages(thread.id)
-            .then((messages) => setMessages(thread.id, messages))
-        )
       })
-  }, [serviceHub, setThreads, setMessages])
+  }, [serviceHub, setThreads])
 
   // Check for app updates
   useEffect(() => {