diff --git a/libnymea-core/servers/tcpserver.cpp b/libnymea-core/servers/tcpserver.cpp
index dc3fa232..2497f88e 100644
--- a/libnymea-core/servers/tcpserver.cpp
+++ b/libnymea-core/servers/tcpserver.cpp
@@ -202,6 +202,10 @@ bool TcpServer::stopServer()
     if (!m_server)
         return true;
 
+    foreach (QTcpSocket *client, m_clientList) {
+        client->abort();
+    }
+
     m_server->close();
     m_server->deleteLater();
     m_server = nullptr;
diff --git a/libnymea-core/servers/websocketserver.cpp b/libnymea-core/servers/websocketserver.cpp
index bb0bf062..37de1f90 100644
--- a/libnymea-core/servers/websocketserver.cpp
+++ b/libnymea-core/servers/websocketserver.cpp
@@ -240,7 +240,7 @@ bool WebSocketServer::stopServer()
 
     if (m_server) {
         m_server->close();
-        delete m_server;
+        m_server->deleteLater();
         m_server = nullptr;
     }
     return true;