[Service] Fix deadlock