diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go
index 107bdd0a23529a8a1e441ab5d55714a0315c7473..4e8070158652f04205f51ca6d38ba1f5db81ef2a 100644
--- a/internal/llm/agent/agent.go
+++ b/internal/llm/agent/agent.go
@@ -859,7 +859,7 @@ func (a *agent) UpdateModel() error {
 
 	// Get current provider configuration
 	currentProviderCfg := cfg.GetProviderForModel(a.agentCfg.Model)
-	if currentProviderCfg.ID == "" {
+	if currentProviderCfg == nil || currentProviderCfg.ID == "" {
 		return fmt.Errorf("provider for agent %s not found in config", a.agentCfg.Name)
 	}