diff --git a/minode/i2p/controller.py b/minode/i2p/controller.py
index 358ff02..9f655e4 100644
--- a/minode/i2p/controller.py
+++ b/minode/i2p/controller.py
@@ -17,6 +17,8 @@ class I2PController(I2PThread):
         self.nick = b'MiNode_' + base64.b16encode(os.urandom(4)).lower()
 
         while True:
+            if state.shutting_down:
+                return
             try:
                 self.s = socket.create_connection((self.host, self.port))
                 break