diff --git a/internal/taskfile/taskfile.go b/internal/taskfile/taskfile.go
index b8cf5da9..fc6b1299 100644
--- a/internal/taskfile/taskfile.go
+++ b/internal/taskfile/taskfile.go
@@ -41,5 +41,11 @@ func (tf *Taskfile) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	if tf.Expansions <= 0 {
 		tf.Expansions = 2
 	}
+	if tf.Vars == nil {
+		tf.Vars = &Vars{}
+	}
+	if tf.Env == nil {
+		tf.Env = &Vars{}
+	}
 	return nil
 }
diff --git a/internal/taskfile/var.go b/internal/taskfile/var.go
index 99946f8a..2466e93c 100644
--- a/internal/taskfile/var.go
+++ b/internal/taskfile/var.go
@@ -50,9 +50,6 @@ func (vs *Vars) Merge(other *Vars) {
 
 // Set sets a value to a given key
 func (vs *Vars) Set(key string, value Var) {
-	if vs == nil {
-		vs = &Vars{}
-	}
 	if vs.Mapping == nil {
 		vs.Mapping = make(map[string]Var, 1)
 	}