diff --git a/src/api/docker.ts b/src/api/docker.ts
index 046e12fc2..e15958256 100644
--- a/src/api/docker.ts
+++ b/src/api/docker.ts
@@ -196,7 +196,7 @@ export function killContainer(id: string): Promise<void> {
           if (containerInfo.State.Status === 'exited') {
             return container.remove();
           } else if (containerInfo.State.Status === 'running') {
-            return container.kill();
+            return container.stop().then(c => c.remove());
           } else {
             return Promise.resolve();
           }