diff --git a/agents/exec/src/main.go b/agents/exec/src/main.go
index b6e4b85b62..8315ee5ef0 100644
--- a/agents/exec/src/main.go
+++ b/agents/exec/src/main.go
@@ -86,7 +86,6 @@ func init() {
 		"/bin/bash",
 		"shell interpreter and command to execute on slave side of the pty",
 	)
-	process.ShellInterpreter = term.Cmd
 
 	// workspace master server configuration
 	flag.StringVar(
@@ -188,6 +187,7 @@ func main() {
 		cleaner := process.NewCleaner(processCleanupPeriodInMinutes, processCleanupThresholdInMinutes)
 		cleaner.CleanPeriodically()
 	}
+	process.ShellInterpreter = term.Cmd
 
 	// terminal configuration
 	if term.ActivityTrackingEnabled {