diff --git a/core/door_party.js b/core/door_party.js
index 184416f7..aee4438c 100644
--- a/core/door_party.js
+++ b/core/door_party.js
@@ -67,6 +67,7 @@ exports.getModule = class DoorPartyModule extends MenuModule {
 
                             if(doorTracking) {
                                 trackDoorRunEnd(doorTracking);
+                                doorTracking = null;
                             }
                         }
                     };
@@ -103,6 +104,10 @@ exports.getModule = class DoorPartyModule extends MenuModule {
                                 self.client.term.rawWrite(d);
                             });
 
+                            stream.on('end', () => {
+                                sshClient.end();
+                            });
+
                             stream.on('close', () => {
                                 restorePipe();
                                 sshClient.end();