diff --git a/modules/git/command.go b/modules/git/command.go
index 1496b0186..2a00a0a20 100644
--- a/modules/git/command.go
+++ b/modules/git/command.go
@@ -11,10 +11,12 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"runtime"
 	"strings"
 	"time"
 
 	"code.gitea.io/gitea/modules/process"
+	"github.com/mcuadros/go-version"
 )
 
 var (
@@ -130,7 +132,9 @@ func (c *Command) RunInDirTimeoutEnvFullPipelineFunc(env []string, timeout time.
 	}
 
 	// TODO: verify if this is still needed in golang 1.15
-	cmd.Env = append(cmd.Env, "GODEBUG=asyncpreemptoff=1")
+	if version.Compare(runtime.Version(), "go1.15", "<") {
+		cmd.Env = append(cmd.Env, "GODEBUG=asyncpreemptoff=1")
+	}
 	cmd.Dir = dir
 	cmd.Stdout = stdout
 	cmd.Stderr = stderr