diff --git a/webservice/webservice.py b/webservice/webservice.py
index 664bd6ad9cbb1be200b9d689f0ac5b1736e3b0a0..218ef6799939a9f10b474e26fb4e24e5c6faa15c 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -646,11 +646,6 @@ class ActionsServer:
         self.socket.bind("{}:{}".format(config['web-service']['bind-to'],
                                         config['web-service']['port']))
 
-    @classmethod
-    async def launch(cls, config, mode):
-        server = cls(config, mode)
-        return await server.run()
-
     async def run(self):
         """The main server loop
 
@@ -1185,8 +1180,9 @@ def main():
     slurm_monitor_thread.start()
 
     # Launch the ZMQ server to handle requests for calibration
+    server = ActionsServer(config, mode)
     loop = asyncio.get_event_loop()
-    loop.run_until_complete(ActionsServer.launch(config, mode))
+    loop.run_until_complete(server.run())
     loop.close()