diff --git a/builtin/bins/dkron-executor-shell/shell.go b/builtin/bins/dkron-executor-shell/shell.go
index d2fe44504..e3978c0cc 100644
--- a/builtin/bins/dkron-executor-shell/shell.go
+++ b/builtin/bins/dkron-executor-shell/shell.go
@@ -111,19 +111,21 @@ func (s *Shell) ExecuteImpl(args *dktypes.ExecuteRequest, cb dkplugin.StatusHelp
 	var jobTimeoutMessage string
 	var jobTimedOut bool
 
-	slowTimer := time.AfterFunc(jt, func() {
-		err = cmd.Process.Kill()
-		if err != nil {
-			jobTimeoutMessage = fmt.Sprintf("shell: Job '%s' execution time exceeding defined timeout %v. SIGKILL returned error. Job may not have been killed", command, jt)
-		} else {
-			jobTimeoutMessage = fmt.Sprintf("shell: Job '%s' execution time exceeding defined timeout %v. Job was killed", command, jt)
-		}
-
-		jobTimedOut = true
-		return
-	})
-
-	defer slowTimer.Stop()
+	if jt != 0 {
+		slowTimer := time.AfterFunc(jt, func() {
+			err = cmd.Process.Kill()
+			if err != nil {
+				jobTimeoutMessage = fmt.Sprintf("shell: Job '%s' execution time exceeding defined timeout %v. SIGKILL returned error. Job may not have been killed", command, jt)
+			} else {
+				jobTimeoutMessage = fmt.Sprintf("shell: Job '%s' execution time exceeding defined timeout %v. Job was killed", command, jt)
+			}
+
+			jobTimedOut = true
+			return
+		})
+
+		defer slowTimer.Stop()
+	}
 
 	// Warn if buffer is overwritten
 	if output.TotalWritten() > output.Size() {