diff --git a/lib/tfw/networking/zmq_websocket_handler.py b/lib/tfw/networking/zmq_websocket_handler.py
index 97d9b6d..8017220 100644
--- a/lib/tfw/networking/zmq_websocket_handler.py
+++ b/lib/tfw/networking/zmq_websocket_handler.py
@@ -9,10 +9,8 @@ log = logging.getLogger(__name__)
 
 
 class ZMQWebSocketHandler(WebSocketHandler):
-    _event_handler_connector = EventHandlerConnector() #----.
-    # TODO: investigate thread safety!    <-----------------'
-    # ZMQ sockets shared between several WebSocketHandler instances
-    # http://pyzmq.readthedocs.io/en/latest/morethanbindings.html#thread-safety
+    _event_handler_connector = EventHandlerConnector()
+
     def __init__(self, application, request, **kwargs):
         super().__init__(application, request, **kwargs)