diff --git a/api_wrap_socket.py b/api_wrap_socket.py
index da510983fdca487477690f67d2172e8bf3df8f89..640d5ed9a4f9f226bcda8791716056b2535fbbb3 100644
--- a/api_wrap_socket.py
+++ b/api_wrap_socket.py
@@ -18,17 +18,16 @@
 # On disconnect the queue consumer is cancelled so that new 
 # messages are left in the queue
 
-import concurrent.futures
 import json
 import uuid
 import time
-from twisted.internet import reactor, threads
+from twisted.internet import reactor
 from twisted.web.server import Site
 from twisted.web.resource import Resource
 from twisted.web.wsgi import WSGIResource
 from autobahn.exception import Disconnected
 from autobahn.twisted.resource import WebSocketResource
-from autobahn.twisted.websocket import WebSocketServerFactory, WebSocketServerProtocol, listenWS
+from autobahn.twisted.websocket import WebSocketServerFactory, WebSocketServerProtocol
 from models.client_model import ClientModel
 from models.token_model import TokenModel
 from api_rest import create_app
@@ -68,16 +67,12 @@ class SubscriptionServerProtocol(WebSocketServerProtocol):
             if valid:
                 try:
                     client_id = parsed.get('client_id')
-                    client = self.apiClients.get(parsed.get('client_id'))
+                    client = self.apiClients.get(client_id)
                     if client: 
                         self.client = client
                         allow = True
                 except Exception: 
                     allow = False
-        
-        if allow:
-            # setup queue consumer
-            SubscriptionListener.createListener(self)
                 
         return allow
         
@@ -92,6 +87,9 @@ class SubscriptionServerProtocol(WebSocketServerProtocol):
         Try authentication
         """
         allow = self.auth(request.headers)
+        if allow:
+            # setup queue consumer
+            SubscriptionListener.createListener(self)
              
     def onMessage(self, payload, isBinary):
         if not isBinary: