diff --git a/ui/src/providers/ChatProvider.tsx b/ui/src/providers/ChatProvider.tsx
index 040a243..e246983 100644
--- a/ui/src/providers/ChatProvider.tsx
+++ b/ui/src/providers/ChatProvider.tsx
@@ -1,5 +1,6 @@
 import { Chat, useCreateChatClient } from "stream-chat-react";
 import { useUser } from "./UserStoreProvider";
+import { LoadingSpinner } from "@ui/components/LoadingSpinner";
 
 export default function ChatProvider({
   children,
@@ -18,8 +19,24 @@ export default function ChatProvider({
     },
   });
 
+  if (!user.streamToken) {
+    return (
+      <div className="flex items-center justify-center min-h-screen">
+        <div className="text-center">
+          <h2 className="text-xl font-semibold text-red-600 mb-2">
+            Chat Indisponible
+          </h2>
+          <p className="text-gray-600">
+            Impossible de se connecter au service de chat. Veuillez essayer de
+            rafraîchir la page.
+          </p>
+        </div>
+      </div>
+    );
+  }
+
   if (!client) {
-    return <div>Loading...</div>;
+    return <LoadingSpinner />;
   }
 
   return (