diff --git a/cmd/argoexec/commands/wait.go b/cmd/argoexec/commands/wait.go
index 0e5d9204b303..6f0484b1f868 100644
--- a/cmd/argoexec/commands/wait.go
+++ b/cmd/argoexec/commands/wait.go
@@ -28,32 +28,35 @@ func waitContainer() error {
 	defer stats.LogStats()
 	stats.StartStatsTicker(5 * time.Minute)
 
+	defer func() {
+		// Killing sidecar containers
+		err := wfExecutor.KillSidecars()
+		if err != nil {
+			log.Errorf("Failed to kill sidecars: %s", err.Error())
+		}
+	}()
+
 	// Wait for main container to complete
 	err := wfExecutor.Wait()
 	if err != nil {
 		wfExecutor.AddError(err)
 		// do not return here so we can still try to kill sidecars & save outputs
 	}
+
 	// Saving logs
 	logArt, err := wfExecutor.SaveLogs()
 	if err != nil {
 		wfExecutor.AddError(err)
-		// do not return here so we can still try to kill sidecars
+		return err
 	}
 	// Saving output parameters
 	err = wfExecutor.SaveParameters()
 	if err != nil {
 		wfExecutor.AddError(err)
-		// do not return here so we can still try to kill sidecars
+		return err
 	}
 	// Saving output artifacts
 	err = wfExecutor.SaveArtifacts()
-	if err != nil {
-		wfExecutor.AddError(err)
-		// do not return here so we can still try to kill sidecars
-	}
-	// Killing sidecar containers
-	err = wfExecutor.KillSidecars()
 	if err != nil {
 		wfExecutor.AddError(err)
 		return err