[WebServer] Clean up LockRecursionException