diff --git a/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala b/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala
index 0249a69..0d8209f 100644
--- a/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala
+++ b/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala
@@ -23,6 +23,9 @@ class InternetServerThread(crypto: Crypto, port: Int,
   }
 
   override def run(): Unit = {
+    if (socket.isEmpty)
+      return
+
     try {
       while (socket.get.isBound) {
         val connection = new InternetConnectionThread(socket.get.accept(), crypto, onDisconnected, onReceive)