diff --git a/shared/libraries/websocket_streaming/src/ws_streaming_server.cpp b/shared/libraries/websocket_streaming/src/ws_streaming_server.cpp
index faabec4..109fbf6 100644
--- a/shared/libraries/websocket_streaming/src/ws_streaming_server.cpp
+++ b/shared/libraries/websocket_streaming/src/ws_streaming_server.cpp
@@ -156,9 +156,9 @@ void WsStreamingServer::onStopServer()
     // openDAQ can (but probably should not) call onStopServer() more than once.
     if (_thread.joinable())
     {
-        _server.close();
         _ioc.stop();
         _thread.join();
+        _server.close();
     }
 }