@@ -1389,6 +1389,20 @@ func TestTaskDotenvFail(t *testing.T) {
 	tt.Run(t)
 }
 
+func TestTaskDotenvShouldErrorWhenIncludingDependantTaskDotenvs(t *testing.T) {
+	var buff bytes.Buffer
+	e := task.Executor{
+		Dir:        "testdata/dotenv_task/included",
+		Entrypoint: "Taskfile.yml",
+		Summary:    true,
+		Stdout:     &buff,
+		Stderr:     &buff,
+	}
+	err := e.Setup()
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "move the dotenv")
+}
+
 func TestTaskDotenvOverriddenByEnv(t *testing.T) {
 	tt := fileContentTest{
 		Dir:       "testdata/dotenv_task/default",
 
@@ -121,7 +121,15 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, error) {
 			return err
 		}
 
-		if v >= 3.0 && len(includedTaskfile.Dotenv) > 0 {
+		tasksWithDotenv := false
+		for _, v := range includedTaskfile.Tasks {
+			if len(v.Dotenv) > 0 {
+				tasksWithDotenv = true
+				break
+			}
+		}
+
+		if v >= 3.0 && (len(includedTaskfile.Dotenv) > 0 || tasksWithDotenv) {
 			return ErrIncludedTaskfilesCantHaveDotenvs
 		}
 
 
@@ -0,0 +1,7 @@
+version: '3'
+
+tasks:
+  dotenv:
+    dotenv: ['.env']
+    cmds:
+      - echo "$FOO" > included-dotenv.txt
@@ -0,0 +1,7 @@
+version: '3'
+
+includes:
+  included: ./Included.yml
+
+env:
+  FOO: global