diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index 6d479bf..2a96f26 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -471,12 +471,13 @@ namespace fc { namespace http {
             }
             ~websocket_client_impl()
             {
-               if(_connection )
+               if( _connection )
                {
                   _connection->close(0, "client closed");
                   _connection.reset();
-                  _closed->wait();
                }
+               if( _closed )
+                  _closed->wait();
             }
             fc::promise<void>::ptr             _connected;
             fc::promise<void>::ptr             _closed;