diff --git a/app/api/chat-stream/route.ts b/app/api/chat-stream/route.ts
index 8803a4252..ad40c6be1 100644
--- a/app/api/chat-stream/route.ts
+++ b/app/api/chat-stream/route.ts
@@ -1,4 +1,3 @@
-import type { ChatRequest } from "../chat/typing";
 import { createParser } from "eventsource-parser";
 import { NextRequest } from "next/server";
 
diff --git a/app/components/home.tsx b/app/components/home.tsx
index 1265149a1..ffe813e0d 100644
--- a/app/components/home.tsx
+++ b/app/components/home.tsx
@@ -465,6 +465,16 @@ function showMemoryPrompt(session: ChatSession) {
   });
 }
 
+const useHasHydrated = () => {
+  const [hasHydrated, setHasHydrated] = useState<boolean>(false);
+
+  useEffect(() => {
+    setHasHydrated(true);
+  }, []);
+
+  return hasHydrated;
+};
+
 export function Home() {
   const [createNewSession, currentIndex, removeSession] = useChatStore(
     (state) => [
@@ -473,7 +483,7 @@ export function Home() {
       state.removeSession,
     ]
   );
-  const loading = !useChatStore?.persist?.hasHydrated();
+  const loading = !useHasHydrated();
   const [showSideBar, setShowSideBar] = useState(true);
 
   // setting
diff --git a/app/components/settings.tsx b/app/components/settings.tsx
index 56165daa2..eb9bc6d49 100644
--- a/app/components/settings.tsx
+++ b/app/components/settings.tsx
@@ -354,7 +354,7 @@ export function Settings(props: { closeSettings: () => void }) {
             <input
               type="number"
               min={100}
-              max={4000}
+              max={4096}
               value={config.modelConfig.max_tokens}
               onChange={(e) =>
                 updateConfig(
diff --git a/app/components/userRole.tsx b/app/components/userRole.tsx
new file mode 100644
index 000000000..e69de29bb