Fix for when Client is started after service has already been registered