diff --git a/server/src/uds/core/workers/UserServiceCleaner.py b/server/src/uds/core/workers/UserServiceCleaner.py
index 161ab1dc..1857ab87 100644
--- a/server/src/uds/core/workers/UserServiceCleaner.py
+++ b/server/src/uds/core/workers/UserServiceCleaner.py
@@ -69,6 +69,7 @@ class UserServiceRemover(Job):
 
     @transaction.commit_on_success        
     def run(self):
-        removables = UserService.objects.filter(state=State.REMOVABLE)[0:UserServiceRemover.removeAtOnce]
+        removeFrom = getSqlDatetime() - timedelta(seconds=10) # We keep at least 30 seconds the machine before removing it, so we avoid connections errors
+        removables = UserService.objects.filter(state=State.REMOVABLE, state_date__lt=removeFrom)[0:UserServiceRemover.removeAtOnce]
         for us in removables:
             UserServiceManager.manager().remove(us)
diff --git a/server/src/uds/transports/NX/applet/nxtransport.jar b/server/src/uds/transports/NX/applet/nxtransport.jar
index c859f30c..8d3496ac 100644
Binary files a/server/src/uds/transports/NX/applet/nxtransport.jar and b/server/src/uds/transports/NX/applet/nxtransport.jar differ