diff --git a/src/components/chat-view/chat-input/ModelSelect.tsx b/src/components/chat-view/chat-input/ModelSelect.tsx
index 21d197a..8f8e909 100644
--- a/src/components/chat-view/chat-input/ModelSelect.tsx
+++ b/src/components/chat-view/chat-input/ModelSelect.tsx
@@ -148,7 +148,6 @@ export function ModelSelect() {
 			try {
 				const models = await GetProviderModelIds(modelProvider)
 				setModelIds(models)
-				setChatModelId(settings.chatModelId)
 			} catch (error) {
 				console.error('Failed to fetch provider models:', error)
 				setModelIds([])
@@ -158,7 +157,13 @@ export function ModelSelect() {
 		}
 
 		fetchModels()
-	}, [modelProvider, settings.chatModelId])
+	}, [modelProvider])
+
+	// Sync chat model id & chat model provider
+	useEffect(() => {
+		setModelProvider(settings.chatModelProvider)
+		setChatModelId(settings.chatModelId)
+	}, [settings.chatModelProvider, settings.chatModelId])
 
 	const searchableItems = useMemo(() => {
 		return modelIds.map((id) => ({
@@ -197,7 +202,7 @@ export function ModelSelect() {
 						{isOpen ? <ChevronUp size={12} /> : <ChevronDown size={12} />}
 					</div>
 					<div className="infio-chat-input-model-select__model-name">
-						[{modelProvider}] {chatModelId}
+						{chatModelId}
 					</div>
 				</DropdownMenu.Trigger>
 
diff --git a/src/contexts/LLMContext.tsx b/src/contexts/LLMContext.tsx
index 85238d6..b010634 100644
--- a/src/contexts/LLMContext.tsx
+++ b/src/contexts/LLMContext.tsx
@@ -48,7 +48,7 @@ export function LLMProvider({ children }: PropsWithChildren) {
 			provider: settings.chatModelProvider,
 			modelId: settings.chatModelId,
 		}
-	}, [settings])
+	}, [settings.chatModelProvider, settings.chatModelId])
 
 	// const applyModel = useMemo((): LLMModel => {
 	// 	return {