diff --git a/client/driver/docker.go b/client/driver/docker.go
index 5a8112d99..8b902d27d 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -1852,7 +1852,7 @@ func (h *DockerHandle) Signal(s os.Signal) error {
 // Kill is used to terminate the task. This uses `docker stop -t killTimeout`
 func (h *DockerHandle) Kill() error {
 	// Stop the container
-	err := h.client.StopContainer(h.containerID, uint(h.killTimeout.Seconds()))
+	err := h.waitClient.StopContainer(h.containerID, uint(h.killTimeout.Seconds()))
 	if err != nil {
 
 		// Container has already been removed.