Fix server stop when removing