diff --git a/.bin/Scripts/functions/osticket.py b/.bin/Scripts/functions/osticket.py
index f2369534..da5ea521 100644
--- a/.bin/Scripts/functions/osticket.py
+++ b/.bin/Scripts/functions/osticket.py
@@ -1,5 +1,6 @@
 # Wizard Kit: Functions - osTicket
 
+import atexit
 import mysql.connector as mariadb
 
 from functions.data import *
@@ -50,7 +51,11 @@ class osTicket():
 
     # Only open tunnel if one doesn't exist
     if self.tunnel_proc is None or self.tunnel_proc.poll() is not None:
+      if self.tunnel_proc:
+        # Unregister previous terminate
+        atexit.unregister(self.tunnel_proc.terminate)
       self.tunnel_proc = popen_program(cmd)
+      atexit.register(self.tunnel_proc.terminate)
 
     # Connect to database
     for x in range(5):