diff --git a/cmd/tinycode/config.go b/cmd/tinycode/config.go
index ccb91465b..aba3b3527 100644
--- a/cmd/tinycode/config.go
+++ b/cmd/tinycode/config.go
@@ -461,7 +461,7 @@ func startDiscovery(ctx context.Context, reg *provider.Registry, b *bus.Bus, cfg
 	disc := provider.NewDiscovery(reg, b)
 
 	ollamaURL := "http://127.0.0.1:11434"
-	lmStudioURL := "http://127.0.0.1:1234"
+	lmStudioURL := ""
 	vllmURL := ""
 
 	if v := os.Getenv("TINYCODE_OLLAMA_HOST"); v != "" {
@@ -471,6 +471,8 @@ func startDiscovery(ctx context.Context, reg *provider.Registry, b *bus.Bus, cfg
 	}
 	if v := os.Getenv("TINYCODE_LMSTUDIO_HOST"); v != "" {
 		lmStudioURL = v
+	} else if _, ok := cfg.Provider["lm-studio"]; ok {
+		lmStudioURL = "http://127.0.0.1:1234"
 	}
 	if v := os.Getenv("TINYCODE_VLLM_HOST"); v != "" {
 		vllmURL = v