diff --git a/app/src/main.cpp b/app/src/main.cpp
index 076ae3f02b63586e7f7174310e5758cff050c690..acfa5fd551e4b60dac72f2a2b4173a7955b99c77 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -49,12 +49,13 @@ int main(int argc, char *argv[])
 
     // Setup websocket server
     WebSocketServer *webSocketServer = new WebSocketServer(appConfigApplication["id"].toString(), port, &app);
-    if (!webSocketServer->start()) {
+    if (webSocketServer->start()) {
+        qDebug() << "Websocket server started at:" << webSocketServer->serverUrl().toString();
+    }
+    else {
         qCritical() << "Failed to start websocket server:" << webSocketServer->errorString();
         return 1;
     }
 
-    qDebug() << "Websocket server started at:" <<webSocketServer->serverUrl().toString();
-
     return app.exec();
 }
diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp
index 3617fa041b8bf2fe64b058ed1540ec5a8ba92ac2..b32317305bf6ca4680dd5f8befc95a05fabcd737 100644
--- a/app/src/websockets/websocketserver.cpp
+++ b/app/src/websockets/websocketserver.cpp
@@ -11,6 +11,9 @@ WebSocketServer::WebSocketServer(const QString &serverName, quint16 serverPort,
 
 WebSocketServer::~WebSocketServer()
 {
+    if (webSocketServer_->isListening()) {
+        webSocketServer_->close();
+    }
     webSocketServer_->deleteLater();
 }