Clean up and a workaround for chat server issue from desktop version