diff --git a/engine.py b/engine.py
index 598f829..35b98f5 100644
--- a/engine.py
+++ b/engine.py
@@ -166,10 +166,17 @@ class WindowsEngine(GenericEngine):
         """
         Closes the divert connection
         """
+        self.logger.debug("Shutting down Divert engine...")
         if self.divert:
+            self.logger.debug("Closing Divert engine")
             self.divert.close()
             self.divert = None
 
+        if self.divert_thread:
+            self.logger.debug("Joining divert thread")
+            self.divert_thread.join()
+        self.logger.debug("Shutdown complete.")
+
     def run_divert(self):
         """
         Runs actions on packets