diff --git a/internal/cmd/builder.go b/internal/cmd/builder.go
index 7fc063519b..e85185880c 100644
--- a/internal/cmd/builder.go
+++ b/internal/cmd/builder.go
@@ -135,18 +135,16 @@ func Command(obj Runnable, cmd cobra.Command) *cobra.Command {
 			panic("Unknown kind on field " + fieldType.Name + " on " + objValue.Type().Name())
 		}
 
-		if env != nil {
-			for _, env := range env {
-				envs = append(envs, func() {
-					v := os.Getenv(env)
-					if v != "" {
-						fv, err := flags.GetString(name)
-						if err == nil && (fv == "" || fv == defValue) {
-							flags.Set(name, v)
-						}
+		for _, env := range env {
+			envs = append(envs, func() {
+				v := os.Getenv(env)
+				if v != "" {
+					fv, err := flags.GetString(name)
+					if err == nil && (fv == "" || fv == defValue) {
+						_ = flags.Set(name, v)
 					}
-				})
-			}
+				}
+			})
 		}
 	}