Fix double init of service client