diff --git a/src/interface/web/app/common/modelSelector.tsx b/src/interface/web/app/common/modelSelector.tsx
index 6fde77b1..ece4709f 100644
--- a/src/interface/web/app/common/modelSelector.tsx
+++ b/src/interface/web/app/common/modelSelector.tsx
@@ -24,7 +24,7 @@ import {
     PopoverTrigger,
 } from "@/components/ui/popover";
 
-import { ModelOptions, useChatModelOptions } from "./auth";
+import { ModelOptions, useChatModelOptions, useUserConfig } from "./auth";
 import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
 import { Skeleton } from "@/components/ui/skeleton";
 
@@ -39,6 +39,7 @@ export function ModelSelector({ ...props }: ModelSelectorProps) {
     const { models, isLoading, error } = useChatModelOptions();
     const [peekedModel, setPeekedModel] = useState<ModelOptions | undefined>(undefined);
     const [selectedModel, setSelectedModel] = useState<ModelOptions | undefined>(undefined);
+    const { userConfig } = useUserConfig();
 
     useEffect(() => {
         if (!models?.length) return;
@@ -47,10 +48,14 @@ export function ModelSelector({ ...props }: ModelSelectorProps) {
             const model = models.find(model => model.name === props.selectedModel);
             setSelectedModel(model || models[0]);
             return;
+        } else if (userConfig) {
+            const model = models.find(model => model.id === userConfig.selected_chat_model_config);
+            setSelectedModel(model || models[0]);
+            return;
         }
 
         setSelectedModel(models[0]);
-    }, [models, props.selectedModel]);
+    }, [models, props.selectedModel, userConfig]);
 
     useEffect(() => {
         if (selectedModel) {
diff --git a/src/interface/web/app/components/chatHistory/chatHistory.tsx b/src/interface/web/app/components/chatHistory/chatHistory.tsx
index ec4fe062..3cf312c0 100644
--- a/src/interface/web/app/components/chatHistory/chatHistory.tsx
+++ b/src/interface/web/app/components/chatHistory/chatHistory.tsx
@@ -282,7 +282,6 @@ export default function ChatHistory(props: ChatHistoryProps) {
     function constructAgentName() {
         if (!data || !data.agent || !data.agent?.name) return `Agent`;
         if (data.agent.is_hidden) return 'Khoj';
-        console.log(data.agent);
         return data.agent?.name;
     }
 
diff --git a/src/interface/web/app/components/chatSidebar/chatSidebar.tsx b/src/interface/web/app/components/chatSidebar/chatSidebar.tsx
index c394d8c2..7e89f3e0 100644
--- a/src/interface/web/app/components/chatSidebar/chatSidebar.tsx
+++ b/src/interface/web/app/components/chatSidebar/chatSidebar.tsx
@@ -78,7 +78,6 @@ function ChatSidebarInternal({ ...props }: ChatSideBarProps) {
 
     function setupAgentData() {
         if (agentData) {
-            setSelectedModel(agentData.chat_model);
             setInputTools(agentData.input_tools);
             if (agentData.input_tools === undefined || agentData.input_tools.length === 0) {
                 setInputTools(agentConfigurationOptions?.input_tools ? Object.keys(agentConfigurationOptions.input_tools) : []);
@@ -94,8 +93,11 @@ function ChatSidebarInternal({ ...props }: ChatSideBarProps) {
 
             if (agentData.slug.toLowerCase() === "khoj") {
                 setIsDefaultAgent(true);
+                setSelectedModel(undefined);
+                setCustomPrompt(undefined);
             } else {
                 setCustomPrompt(agentData.persona);
+                setSelectedModel(agentData.chat_model);
             }
         }
     }
diff --git a/src/interface/web/yarn.lock b/src/interface/web/yarn.lock
index 84c56b27..0c8b8c2f 100644
--- a/src/interface/web/yarn.lock
+++ b/src/interface/web/yarn.lock
@@ -977,7 +977,7 @@
   dependencies:
     "@radix-ui/react-compose-refs" "1.1.1"
 
-"@radix-ui/react-switch@^1.1.1", "@radix-ui/react-switch@^1.1.2":
+"@radix-ui/react-switch@^1.1.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-switch/-/react-switch-1.1.2.tgz#61323f4cccf25bf56c95fceb3b56ce1407bc9aec"
   integrity sha512-zGukiWHjEdBCRyXvKR6iXAQG6qXm2esuAD6kDOi9Cn+1X6ev3ASo4+CsYaD6Fov9r/AQFekqnD/7+V0Cs6/98g==