anchor.diff:        );
       }
       if (event is SettingsDeleteServer) {
  -      yield* _mapSettingsDeleteServerToState(
  -          settings: settings, logging: logging, id: event.id);
  +      yield* _mapSettingsDeleteServerToState(id: event.id);
       }
       if (event is SettingsUpdatePrimaryConnection) {
         yield* _mapSettingsUpdatePrimaryConnectionToState(
  -        settings: settings,
  -        logging: logging,
           id: event.id,
           primaryConnectionAddress: event.primaryConnectionAddress,
         );
       }
       if (event is SettingsUpdateSecondaryConnection) {
         yield* _mapSettingsUpdateSecondaryConnectionToState(
  -        settings: settings,
  -        logging: logging,
           id: event.id,
           secondaryConnectionAddress: event.secondaryConnectionAddress,
         );
       }
       if (event is SettingsUpdateDeviceToken) {
         yield* _mapSettingsUpdateDeviceTokenToState(
  -        settings: settings,
  -        logging: logging,
           id: event.id,
           deviceToken: event.deviceToken,
         );
       }
       if (event is SettingsUpdateServerTimeout) {
         yield* _mapSettingsUpdateServerTimeoutToState(
  -        settings: settings,
  -        logging: logging,
           timeout: event.timeout,
         );
       }
       if (event is SettingsUpdateRefreshRate) {
         yield* _mapSettingsUpdateRefreshRateToState(
  -        settings: settings,
  -        logging: logging,
           refreshRate: event.refreshRate,
         );
       }
       if (event is SettingsUpdateLastSelectedServer) {
         yield* _mapSettingsUpdateLastSelectedServerToState(
  -        settings: settings,
           tautulliId: event.tautulliId,
         );
       }
     }
   
  -  Stream<SettingsState> _mapSettingsLoadToState(Settings settings) async* {
  +  Stream<SettingsState> _mapSettingsLoadToState() async* {
       yield SettingsLoadInProgress();
  -    yield* _fetchAndYieldSettings(settings);
  +    yield* _fetchAndYieldSettings();
  +    yield* _checkForServerChanges();
     }
   
     Stream<SettingsState> _mapSettingsAddServerToState({
  -    @required Settings settings,
  -    @required Logging logging,
       @required String primaryConnectionAddress,
       @required String deviceToken,
       @required String tautulliId,
  
positive.code:     }
      if (event is SettingsUpdateServer) {
        yield* _mapSettingsUpdateServerToState(
          settings: settings,
          logging: logging,
          id: event.id,
          primaryConnectionAddress: event.primaryConnectionAddress,
          secondaryConnectionAddress: event.secondaryConnectionAddress,
  
negative.code:     SettingsEvent event,
    ) async* {
      if (event is SettingsLoad) {
        yield* _mapSettingsLoadToState();
      }
      if (event is SettingsAddServer) {
        yield* _mapSettingsAddServerToState(
          primaryConnectionAddress: event.primaryConnectionAddress,
          deviceToken: event.deviceToken,
          tautulliId: event.tautulliId,
  