[Server] Fix concurrency issue