diff --git a/cli/cli.go b/cli/cli.go
index b4b7893a..5dd21281 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -73,7 +73,10 @@ func Cli(version string) (err error) {
 	}
 
 	if currentFlags.ChangeDefaultModel {
-		err = registry.Defaults.Setup()
+		if err = registry.Defaults.Setup(); err != nil {
+			return
+		}
+		err = registry.SaveEnvFile()
 		return
 	}