diff --git a/components/commandserver/server.cpp b/components/commandserver/server.cpp
index a634242423..26f328ecdf 100755
--- a/components/commandserver/server.cpp
+++ b/components/commandserver/server.cpp
@@ -53,7 +53,7 @@ namespace OMW { namespace CommandServer { namespace Detail {
     ///
     void Connection::stop()
     {
-        mSocket.close();
+        mSocket.shutdown(boost::asio::socket_base::shutdown_both);
         mpThread->join();
     }