diff --git a/client/executor/exec_linux.go b/client/executor/exec_linux.go
index 29cd3b973..588659dfc 100644
--- a/client/executor/exec_linux.go
+++ b/client/executor/exec_linux.go
@@ -542,6 +542,11 @@ func (e *LinuxExecutor) destroyCgroup() error {
 			multierror.Append(errs, fmt.Errorf("Failed to kill Pid %v: %v", pid, err))
 			continue
 		}
+
+		if _, err := process.Wait(); err != nil {
+			multierror.Append(errs, fmt.Errorf("Failed to wait Pid %v: %v", pid, err))
+			continue
+		}
 	}
 
 	// Remove the cgroup.