diff --git a/server/src/uds/models/ticket_store.py b/server/src/uds/models/ticket_store.py
index 005909e6..0a788806 100644
--- a/server/src/uds/models/ticket_store.py
+++ b/server/src/uds/models/ticket_store.py
@@ -236,9 +236,6 @@ class TicketStore(UUIDModel):
             # if not found any, will raise an execption
             user = User.objects.get(uuid=data['u'])
             userService = UserService.objects.get(uuid=data['s'], user=user)
-            # Ensure userservice is usable
-            if not userService.isUsable():
-                raise Exception('Service is not usable')  # Not usable, so we will not use it :)
 
             host = data['h']
 
diff --git a/tunnel-server/src/udstunnel.py b/tunnel-server/src/udstunnel.py
index 47a032dc..6ec4c223 100755
--- a/tunnel-server/src/udstunnel.py
+++ b/tunnel-server/src/udstunnel.py
@@ -165,11 +165,12 @@ async def tunnel_proc_async(
 
     async with curio.TaskGroup() as tg:
         await tg.spawn(run_server, pipe, cfg, tg)
+        await tg.join()
         # Reap all of the children tasks as they complete
-        async for task in tg:
-            logger.debug(f'REMOVING async task {task!r}')
-            task.joined = True
-            del task
+        # async for task in tg:
+        #    logger.debug(f'REMOVING async task {task!r}')
+        #    task.joined = True
+        #    del task
 
 
 def tunnel_main():