diff --git a/server/websocketserver.cpp b/server/websocketserver.cpp
index 0d8ec35d..c76e6e81 100644
--- a/server/websocketserver.cpp
+++ b/server/websocketserver.cpp
@@ -85,6 +85,7 @@ WebSocketServer::WebSocketServer(const QSslConfiguration &sslConfiguration, QObj
 /*! Destructor of this \l{WebSocketServer}. */
 WebSocketServer::~WebSocketServer()
 {
+    stopServer();
 }
 
 /*! Send the given \a data map to the client with the given \a clientId.
@@ -220,7 +221,7 @@ bool WebSocketServer::stopServer()
     m_server->close();
     delete m_server;
     m_server = 0;
-    return false;
+    return true;
 }
 
 }