diff --git a/misp_modules/__init__.py b/misp_modules/__init__.py
index 440ad3f..21e3db3 100644
--- a/misp_modules/__init__.py
+++ b/misp_modules/__init__.py
@@ -183,10 +183,9 @@ class QueryModule(tornado.web.RequestHandler):
     executor = ThreadPoolExecutor(nb_threads)
 
     @run_on_executor
-    def run_request(self, jsonpayload):
-        x = json.loads(jsonpayload)
+    def run_request(self, module, jsonpayload):
         log.debug('MISP QueryModule request {0}'.format(jsonpayload))
-        response = mhandlers[x['module']].handler(q=jsonpayload)
+        response = mhandlers[module].handler(q=jsonpayload)
         return json.dumps(response)
 
     @tornado.gen.coroutine
@@ -198,7 +197,7 @@ class QueryModule(tornado.web.RequestHandler):
                 timeout = datetime.timedelta(seconds=int(dict_payload.get('timeout')))
             else:
                 timeout = datetime.timedelta(seconds=300)
-            response = yield tornado.gen.with_timeout(timeout, self.run_request(jsonpayload))
+            response = yield tornado.gen.with_timeout(timeout, self.run_request(dict_payload['module'], jsonpayload))
             self.write(response)
         except tornado.gen.TimeoutError:
             log.warning('Timeout on {} '.format(dict_payload['module']))