diff --git a/lib/utils/farcaster-utils.js b/lib/utils/farcaster-utils.js
index f9e3718a0..4b7fb4224 100644
--- a/lib/utils/farcaster-utils.js
+++ b/lib/utils/farcaster-utils.js
@@ -1,76 +1,88 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 
 import {
   setSyncedMetadataEntryActionType,
   clearSyncedMetadataEntryActionType,
 } from '../actions/synced-metadata-actions.js';
 import { IdentityClientContext } from '../shared/identity-client-context.js';
 import { syncedMetadataNames } from '../types/synced-metadata-types.js';
 import { useSelector, useDispatch } from '../utils/redux-utils.js';
 
 const DISABLE_CONNECT_FARCASTER_ALERT = true;
+const NO_FID_METADATA = 'NONE';
 
 function useCurrentUserFID(): ?string {
-  return useSelector(
+  // There is a distinction between null & undefined for the fid value.
+  // If the fid is null this means that the user has decided NOT to set
+  // a Farcaster association. If the fid is undefined this means that
+  // the user has not yet been prompted to set a Farcaster association.
+  const currentUserFID = useSelector(
     state =>
       state.syncedMetadataStore.syncedMetadata[
         syncedMetadataNames.CURRENT_USER_FID
-      ] ?? null,
+      ] ?? undefined,
   );
+
+  if (currentUserFID === NO_FID_METADATA) {
+    return null;
+  }
+
+  return currentUserFID;
 }
 
 function useLinkFID(): (fid: string) => Promise<void> {
   const identityClientContext = React.useContext(IdentityClientContext);
   invariant(identityClientContext, 'identityClientContext should be set');
 
   const { identityClient } = identityClientContext;
   const { linkFarcasterAccount } = identityClient;
 
   const dispatch = useDispatch();
 
   return React.useCallback(
     async (fid: string) => {
       await linkFarcasterAccount(fid);
 
       dispatch({
         type: setSyncedMetadataEntryActionType,
         payload: {
           name: syncedMetadataNames.CURRENT_USER_FID,
           data: fid,
         },
       });
     },
     [dispatch, linkFarcasterAccount],
   );
 }
 
 function useUnlinkFID(): () => Promise<void> {
   const identityClientContext = React.useContext(IdentityClientContext);
   invariant(identityClientContext, 'identityClientContext should be set');
 
   const { identityClient } = identityClientContext;
   const { unlinkFarcasterAccount } = identityClient;
 
   const dispatch = useDispatch();
 
   return React.useCallback(async () => {
     await unlinkFarcasterAccount();
 
     dispatch({
       type: clearSyncedMetadataEntryActionType,
       payload: {
         name: syncedMetadataNames.CURRENT_USER_FID,
       },
     });
   }, [dispatch, unlinkFarcasterAccount]);
 }
 
 export {
   DISABLE_CONNECT_FARCASTER_ALERT,
+  NO_FID_METADATA,
   useCurrentUserFID,
   useLinkFID,
   useUnlinkFID,
 };
diff --git a/lib/utils/push-alerts.js b/lib/utils/push-alerts.js
index 7abc28e82..1c044811c 100644
--- a/lib/utils/push-alerts.js
+++ b/lib/utils/push-alerts.js
@@ -1,38 +1,42 @@
 // @flow
 
 import type { AlertInfo } from '../types/alert-types.js';
 import { isDev } from '../utils/dev-utils.js';
 import { DISABLE_CONNECT_FARCASTER_ALERT } from '../utils/farcaster-utils.js';
 
 const msInDay = 24 * 60 * 60 * 1000;
 
 function shouldSkipPushPermissionAlert(alertInfo: AlertInfo): boolean {
   return (
     (alertInfo.totalAlerts > 3 &&
       alertInfo.lastAlertTime > Date.now() - msInDay) ||
     (alertInfo.totalAlerts > 6 &&
       alertInfo.lastAlertTime > Date.now() - msInDay * 3) ||
     (alertInfo.totalAlerts > 9 &&
       alertInfo.lastAlertTime > Date.now() - msInDay * 7)
   );
 }
 
-function shouldSkipConnectFarcasterAlert(alertInfo: AlertInfo): boolean {
+function shouldSkipConnectFarcasterAlert(
+  alertInfo: AlertInfo,
+  fid: ?string,
+): boolean {
   // The isDev check is here so that devs don't get continually spammed
   // with this alert.
   return (
     isDev ||
     DISABLE_CONNECT_FARCASTER_ALERT ||
-    alertInfo.lastAlertTime > Date.now() - msInDay
+    fid !== undefined ||
+    alertInfo.totalAlerts > 0
   );
 }
 
 function shouldSkipCreateSIWEBackupMessageAlert(alertInfo: AlertInfo): boolean {
   return alertInfo.lastAlertTime > Date.now() - msInDay;
 }
 
 export {
   shouldSkipPushPermissionAlert,
   shouldSkipConnectFarcasterAlert,
   shouldSkipCreateSIWEBackupMessageAlert,
 };
diff --git a/native/account/registration/registration-server-call.js b/native/account/registration/registration-server-call.js
index f5f75a490..dc8a66832 100644
--- a/native/account/registration/registration-server-call.js
+++ b/native/account/registration/registration-server-call.js
@@ -1,612 +1,612 @@
 // @flow
 
 import * as React from 'react';
 
 import { setDataLoadedActionType } from 'lib/actions/client-db-store-actions.js';
 import { setSyncedMetadataEntryActionType } from 'lib/actions/synced-metadata-actions.js';
 import {
   legacyKeyserverRegisterActionTypes,
   legacyKeyserverRegister,
   useIdentityPasswordRegister,
   identityRegisterActionTypes,
   deleteAccountActionTypes,
   useDeleteDiscardedIdentityAccount,
 } from 'lib/actions/user-actions.js';
 import { useKeyserverAuthWithRetry } from 'lib/keyserver-conn/keyserver-auth.js';
 import { useLegacyAshoatKeyserverCall } from 'lib/keyserver-conn/legacy-keyserver-call.js';
 import { usePreRequestUserState } from 'lib/selectors/account-selectors.js';
 import { isLoggedInToAuthoritativeKeyserver } from 'lib/selectors/user-selectors.js';
 import {
   type LegacyLogInStartingPayload,
   logInActionSources,
   type LogOutResult,
 } from 'lib/types/account-types.js';
 import { syncedMetadataNames } from 'lib/types/synced-metadata-types.js';
 import { getMessageForException } from 'lib/utils/errors.js';
+import { NO_FID_METADATA } from 'lib/utils/farcaster-utils.js';
 import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
 import { useDispatch } from 'lib/utils/redux-utils.js';
 import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
 import { setURLPrefix } from 'lib/utils/url-utils.js';
 import { waitUntilDatabaseDeleted } from 'lib/utils/wait-until-db-deleted.js';
 
 import type {
   RegistrationServerCallInput,
   UsernameAccountSelection,
   EthereumAccountSelection,
   AvatarData,
 } from './registration-types.js';
 import { authoritativeKeyserverID } from '../../authoritative-keyserver.js';
 import {
   useNativeSetUserAvatar,
   useUploadSelectedMedia,
 } from '../../avatars/avatar-hooks.js';
 import { commCoreModule } from '../../native-modules.js';
 import { persistConfig } from '../../redux/persist.js';
 import { useSelector } from '../../redux/redux-utils.js';
 import { nativeLegacyLogInExtraInfoSelector } from '../../selectors/account-selectors.js';
 import {
   appOutOfDateAlertDetails,
   usernameReservedAlertDetails,
   usernameTakenAlertDetails,
   unknownErrorAlertDetails,
 } from '../../utils/alert-messages.js';
 import Alert from '../../utils/alert.js';
 import { defaultURLPrefix } from '../../utils/url-utils.js';
 import { setNativeCredentials } from '../native-credentials.js';
 import {
   useLegacySIWEServerCall,
   useIdentityWalletRegisterCall,
 } from '../siwe-hooks.js';
 
 // We can't just do everything in one async callback, since the server calls
 // would get bound to Redux state from before the registration. The registration
 // flow has multiple steps where critical Redux state is changed, where
 // subsequent steps depend on accessing the updated Redux state.
 
 // To address this, we break the registration process up into multiple steps.
 // When each step completes we update the currentStep state, and we have Redux
 // selectors that trigger useEffects for subsequent steps when relevant data
 // starts to appear in Redux.
 
 type CurrentStep =
   | { +step: 'inactive' }
   | {
       +step: 'identity_registration_dispatched',
       +clearCachedSelections: () => void,
       +onAlertAcknowledged: ?() => mixed,
       +avatarData: ?AvatarData,
       +credentialsToSave: ?{ +username: string, +password: string },
       +resolve: () => void,
       +reject: Error => void,
     }
   | {
       +step: 'authoritative_keyserver_registration_dispatched',
       +clearCachedSelections: () => void,
       +avatarData: ?AvatarData,
       +credentialsToSave: ?{ +username: string, +password: string },
       +resolve: () => void,
       +reject: Error => void,
     };
 
 const inactiveStep = { step: 'inactive' };
 
 function useRegistrationServerCall(): RegistrationServerCallInput => Promise<void> {
   const [currentStep, setCurrentStep] =
     React.useState<CurrentStep>(inactiveStep);
 
   // STEP 1: ACCOUNT REGISTRATION
 
   const legacyLogInExtraInfo = useSelector(nativeLegacyLogInExtraInfoSelector);
 
   const dispatchActionPromise = useDispatchActionPromise();
   const callLegacyKeyserverRegister = useLegacyAshoatKeyserverCall(
     legacyKeyserverRegister,
   );
   const callIdentityPasswordRegister = useIdentityPasswordRegister();
 
   const identityRegisterUsernameAccount = React.useCallback(
     async (
       accountSelection: UsernameAccountSelection,
       farcasterID: ?string,
       onAlertAcknowledged: ?() => mixed,
     ) => {
       const identityRegisterPromise = (async () => {
         try {
           return await callIdentityPasswordRegister(
             accountSelection.username,
             accountSelection.password,
             farcasterID,
           );
         } catch (e) {
           const messageForException = getMessageForException(e);
           if (messageForException === 'username_reserved') {
             Alert.alert(
               usernameReservedAlertDetails.title,
               usernameReservedAlertDetails.message,
               [{ text: 'OK', onPress: onAlertAcknowledged }],
               { cancelable: !onAlertAcknowledged },
             );
           } else if (messageForException === 'username_already_exists') {
             Alert.alert(
               usernameTakenAlertDetails.title,
               usernameTakenAlertDetails.message,
               [{ text: 'OK', onPress: onAlertAcknowledged }],
               { cancelable: !onAlertAcknowledged },
             );
           } else if (messageForException === 'unsupported_version') {
             Alert.alert(
               appOutOfDateAlertDetails.title,
               appOutOfDateAlertDetails.message,
               [{ text: 'OK', onPress: onAlertAcknowledged }],
               { cancelable: !onAlertAcknowledged },
             );
           } else {
             Alert.alert(
               unknownErrorAlertDetails.title,
               unknownErrorAlertDetails.message,
               [{ text: 'OK', onPress: onAlertAcknowledged }],
               { cancelable: !onAlertAcknowledged },
             );
           }
           throw e;
         }
       })();
       void dispatchActionPromise(
         identityRegisterActionTypes,
         identityRegisterPromise,
       );
       await identityRegisterPromise;
     },
     [callIdentityPasswordRegister, dispatchActionPromise],
   );
 
   const legacyKeyserverRegisterUsernameAccount = React.useCallback(
     async (
       accountSelection: UsernameAccountSelection,
       keyserverURL: string,
       onAlertAcknowledged: ?() => mixed,
     ) => {
       const extraInfo = await legacyLogInExtraInfo();
       const legacyKeyserverRegisterPromise = (async () => {
         try {
           return await callLegacyKeyserverRegister(
             {
               ...extraInfo,
               username: accountSelection.username,
               password: accountSelection.password,
             },
             {
               urlPrefixOverride: keyserverURL,
             },
           );
         } catch (e) {
           const messageForException = getMessageForException(e);
           if (messageForException === 'username_reserved') {
             Alert.alert(
               usernameReservedAlertDetails.title,
               usernameReservedAlertDetails.message,
               [{ text: 'OK', onPress: onAlertAcknowledged }],
               { cancelable: !onAlertAcknowledged },
             );
           } else if (messageForException === 'username_taken') {
             Alert.alert(
               usernameTakenAlertDetails.title,
               usernameTakenAlertDetails.message,
               [{ text: 'OK', onPress: onAlertAcknowledged }],
               { cancelable: !onAlertAcknowledged },
             );
           } else if (messageForException === 'client_version_unsupported') {
             Alert.alert(
               appOutOfDateAlertDetails.title,
               appOutOfDateAlertDetails.message,
               [{ text: 'OK', onPress: onAlertAcknowledged }],
               { cancelable: !onAlertAcknowledged },
             );
           } else {
             Alert.alert(
               unknownErrorAlertDetails.title,
               unknownErrorAlertDetails.message,
               [{ text: 'OK', onPress: onAlertAcknowledged }],
               { cancelable: !onAlertAcknowledged },
             );
           }
           throw e;
         }
       })();
       void dispatchActionPromise(
         legacyKeyserverRegisterActionTypes,
         legacyKeyserverRegisterPromise,
         undefined,
         ({
           calendarQuery: extraInfo.calendarQuery,
         }: LegacyLogInStartingPayload),
       );
       await legacyKeyserverRegisterPromise;
     },
     [legacyLogInExtraInfo, callLegacyKeyserverRegister, dispatchActionPromise],
   );
 
   const legacySiweServerCall = useLegacySIWEServerCall();
   const legacyKeyserverRegisterEthereumAccount = React.useCallback(
     async (
       accountSelection: EthereumAccountSelection,
       keyserverURL: string,
       onAlertAcknowledged: ?() => mixed,
     ) => {
       try {
         await legacySiweServerCall(accountSelection, {
           urlPrefixOverride: keyserverURL,
         });
       } catch (e) {
         const messageForException = getMessageForException(e);
         if (messageForException === 'client_version_unsupported') {
           Alert.alert(
             appOutOfDateAlertDetails.title,
             appOutOfDateAlertDetails.message,
             [{ text: 'OK', onPress: onAlertAcknowledged }],
             { cancelable: !onAlertAcknowledged },
           );
         } else {
           Alert.alert(
             unknownErrorAlertDetails.title,
             unknownErrorAlertDetails.message,
             [{ text: 'OK', onPress: onAlertAcknowledged }],
             { cancelable: !onAlertAcknowledged },
           );
         }
         throw e;
       }
     },
     [legacySiweServerCall],
   );
 
   const identityWalletRegisterCall = useIdentityWalletRegisterCall();
   const identityRegisterEthereumAccount = React.useCallback(
     async (
       accountSelection: EthereumAccountSelection,
       farcasterID: ?string,
       onNonceExpired: () => mixed,
       onAlertAcknowledged: ?() => mixed,
     ) => {
       try {
         await identityWalletRegisterCall({
           address: accountSelection.address,
           message: accountSelection.message,
           signature: accountSelection.signature,
           fid: farcasterID,
         });
       } catch (e) {
         const messageForException = getMessageForException(e);
         if (messageForException === 'nonce_expired') {
           onNonceExpired();
         } else if (messageForException === 'unsupported_version') {
           Alert.alert(
             appOutOfDateAlertDetails.title,
             appOutOfDateAlertDetails.message,
             [{ text: 'OK', onPress: onAlertAcknowledged }],
             { cancelable: !onAlertAcknowledged },
           );
         } else {
           Alert.alert(
             unknownErrorAlertDetails.title,
             unknownErrorAlertDetails.message,
             [{ text: 'OK', onPress: onAlertAcknowledged }],
             { cancelable: !onAlertAcknowledged },
           );
         }
         throw e;
       }
     },
     [identityWalletRegisterCall],
   );
 
   const dispatch = useDispatch();
   const returnedFunc = React.useCallback(
     (input: RegistrationServerCallInput) =>
       new Promise<void>(
         // eslint-disable-next-line no-async-promise-executor
         async (resolve, reject) => {
           try {
             if (currentStep.step !== 'inactive') {
               return;
             }
             const {
               accountSelection,
               avatarData,
               keyserverURL: passedKeyserverURL,
               farcasterID,
               siweBackupSecrets,
               clearCachedSelections,
               onNonceExpired,
               onAlertAcknowledged,
             } = input;
             const keyserverURL = passedKeyserverURL ?? defaultURLPrefix;
             if (
               accountSelection.accountType === 'username' &&
               !usingCommServicesAccessToken
             ) {
               await legacyKeyserverRegisterUsernameAccount(
                 accountSelection,
                 keyserverURL,
                 onAlertAcknowledged,
               );
             } else if (accountSelection.accountType === 'username') {
               await identityRegisterUsernameAccount(
                 accountSelection,
                 farcasterID,
                 onAlertAcknowledged,
               );
             } else if (!usingCommServicesAccessToken) {
               await legacyKeyserverRegisterEthereumAccount(
                 accountSelection,
                 keyserverURL,
                 onAlertAcknowledged,
               );
             } else {
               await identityRegisterEthereumAccount(
                 accountSelection,
                 farcasterID,
                 onNonceExpired,
                 onAlertAcknowledged,
               );
             }
             if (passedKeyserverURL) {
               dispatch({
                 type: setURLPrefix,
                 payload: passedKeyserverURL,
               });
             }
-            if (farcasterID) {
-              dispatch({
-                type: setSyncedMetadataEntryActionType,
-                payload: {
-                  name: syncedMetadataNames.CURRENT_USER_FID,
-                  data: farcasterID,
-                },
-              });
-            }
+            const fidToSave = farcasterID ?? NO_FID_METADATA;
+            dispatch({
+              type: setSyncedMetadataEntryActionType,
+              payload: {
+                name: syncedMetadataNames.CURRENT_USER_FID,
+                data: fidToSave,
+              },
+            });
             if (siweBackupSecrets) {
               await commCoreModule.setSIWEBackupSecrets(siweBackupSecrets);
             }
             const credentialsToSave =
               accountSelection.accountType === 'username'
                 ? {
                     username: accountSelection.username,
                     password: accountSelection.password,
                   }
                 : null;
             if (usingCommServicesAccessToken) {
               setCurrentStep({
                 step: 'identity_registration_dispatched',
                 avatarData,
                 clearCachedSelections,
                 onAlertAcknowledged,
                 credentialsToSave,
                 resolve,
                 reject,
               });
             } else {
               setCurrentStep({
                 step: 'authoritative_keyserver_registration_dispatched',
                 avatarData,
                 clearCachedSelections,
                 credentialsToSave,
                 resolve,
                 reject,
               });
             }
           } catch (e) {
             reject(e);
           }
         },
       ),
     [
       currentStep,
       legacyKeyserverRegisterUsernameAccount,
       identityRegisterUsernameAccount,
       legacyKeyserverRegisterEthereumAccount,
       identityRegisterEthereumAccount,
       dispatch,
     ],
   );
 
   // STEP 2: REGISTERING ON AUTHORITATIVE KEYSERVER
 
   const keyserverAuth = useKeyserverAuthWithRetry(authoritativeKeyserverID);
 
   const isRegisteredOnIdentity = useSelector(
     state =>
       !!state.commServicesAccessToken &&
       !!state.currentUserInfo &&
       !state.currentUserInfo.anonymous,
   );
 
   // We call deleteDiscardedIdentityAccount in order to reset state if identity
   // registration succeeds but authoritative keyserver auth fails
   const deleteDiscardedIdentityAccount = useDeleteDiscardedIdentityAccount();
   const preRequestUserState = usePreRequestUserState();
   const commServicesAccessToken = useSelector(
     state => state.commServicesAccessToken,
   );
 
   const registeringOnAuthoritativeKeyserverRef = React.useRef(false);
   React.useEffect(() => {
     if (
       !isRegisteredOnIdentity ||
       currentStep.step !== 'identity_registration_dispatched' ||
       registeringOnAuthoritativeKeyserverRef.current
     ) {
       return;
     }
     registeringOnAuthoritativeKeyserverRef.current = true;
     const {
       avatarData,
       clearCachedSelections,
       onAlertAcknowledged,
       credentialsToSave,
       resolve,
       reject,
     } = currentStep;
     void (async () => {
       try {
         await keyserverAuth({
           authActionSource: process.env.BROWSER
             ? logInActionSources.keyserverAuthFromWeb
             : logInActionSources.keyserverAuthFromNative,
           setInProgress: () => {},
           hasBeenCancelled: () => false,
           doNotRegister: false,
           password: credentialsToSave?.password,
         });
         setCurrentStep({
           step: 'authoritative_keyserver_registration_dispatched',
           avatarData,
           clearCachedSelections,
           credentialsToSave,
           resolve,
           reject,
         });
       } catch (keyserverAuthException) {
         const messageForException = getMessageForException(
           keyserverAuthException,
         );
         const discardIdentityAccountPromise: Promise<LogOutResult> =
           (async () => {
             try {
               const deletionResult = await deleteDiscardedIdentityAccount(
                 credentialsToSave?.password,
               );
               if (messageForException === 'client_version_unsupported') {
                 Alert.alert(
                   appOutOfDateAlertDetails.title,
                   appOutOfDateAlertDetails.message,
                   [{ text: 'OK', onPress: onAlertAcknowledged }],
                   { cancelable: !onAlertAcknowledged },
                 );
               } else {
                 Alert.alert(
                   unknownErrorAlertDetails.title,
                   unknownErrorAlertDetails.message,
                   [{ text: 'OK', onPress: onAlertAcknowledged }],
                   { cancelable: !onAlertAcknowledged },
                 );
               }
               return deletionResult;
             } catch (deleteException) {
               // We swallow the exception here because
               // discardIdentityAccountPromise is used in a scenario where the
               // user is visibly logged-out, and it's only used to reset state
               // (eg. Redux, SQLite) to a logged-out state. The state reset
               // only occurs when a success action is dispatched, so by
               // swallowing exceptions we ensure that we always dispatch a
               // success.
               Alert.alert(
                 'Account created but login failed',
                 'We were able to create your account, but were unable to log ' +
                   'you in. Try going back to the login screen and logging in ' +
                   'with your new credentials.',
                 [{ text: 'OK', onPress: onAlertAcknowledged }],
                 { cancelable: !onAlertAcknowledged },
               );
               return {
                 currentUserInfo: null,
                 preRequestUserState: {
                   ...preRequestUserState,
                   commServicesAccessToken,
                 },
               };
             }
           })();
         void dispatchActionPromise(
           deleteAccountActionTypes,
           discardIdentityAccountPromise,
         );
         await waitUntilDatabaseDeleted();
         reject(keyserverAuthException);
         setCurrentStep(inactiveStep);
       } finally {
         registeringOnAuthoritativeKeyserverRef.current = false;
       }
     })();
   }, [
     currentStep,
     isRegisteredOnIdentity,
     keyserverAuth,
     dispatchActionPromise,
     deleteDiscardedIdentityAccount,
     preRequestUserState,
     commServicesAccessToken,
   ]);
 
   // STEP 3: SETTING AVATAR
 
   const uploadSelectedMedia = useUploadSelectedMedia();
   const nativeSetUserAvatar = useNativeSetUserAvatar();
 
   const isLoggedInToAuthKeyserver = useSelector(
     isLoggedInToAuthoritativeKeyserver,
   );
 
   const avatarBeingSetRef = React.useRef(false);
   React.useEffect(() => {
     if (
       !isLoggedInToAuthKeyserver ||
       currentStep.step !== 'authoritative_keyserver_registration_dispatched' ||
       avatarBeingSetRef.current
     ) {
       return;
     }
     avatarBeingSetRef.current = true;
     const { avatarData, resolve, clearCachedSelections, credentialsToSave } =
       currentStep;
     void (async () => {
       try {
         if (!avatarData) {
           return;
         }
         let updateUserAvatarRequest;
         if (!avatarData.needsUpload) {
           ({ updateUserAvatarRequest } = avatarData);
         } else {
           const { mediaSelection } = avatarData;
           updateUserAvatarRequest = await uploadSelectedMedia(mediaSelection);
           if (!updateUserAvatarRequest) {
             return;
           }
         }
         await nativeSetUserAvatar(updateUserAvatarRequest);
       } finally {
         dispatch({
           type: setSyncedMetadataEntryActionType,
           payload: {
             name: syncedMetadataNames.DB_VERSION,
             data: `${persistConfig.version}`,
           },
         });
         dispatch({
           type: setDataLoadedActionType,
           payload: {
             dataLoaded: true,
           },
         });
         clearCachedSelections();
         if (credentialsToSave) {
           void setNativeCredentials(credentialsToSave);
         }
         setCurrentStep(inactiveStep);
         avatarBeingSetRef.current = false;
         resolve();
       }
     })();
   }, [
     currentStep,
     isLoggedInToAuthKeyserver,
     uploadSelectedMedia,
     nativeSetUserAvatar,
     dispatch,
   ]);
 
   return returnedFunc;
 }
 
 export { useRegistrationServerCall };
diff --git a/native/components/connect-farcaster-alert-handler.react.js b/native/components/connect-farcaster-alert-handler.react.js
index 7158b798d..fad0f77d9 100644
--- a/native/components/connect-farcaster-alert-handler.react.js
+++ b/native/components/connect-farcaster-alert-handler.react.js
@@ -1,65 +1,64 @@
 // @flow
 
 import { useNavigation } from '@react-navigation/native';
 import * as React from 'react';
 
 import { recordAlertActionType } from 'lib/actions/alert-actions.js';
 import { isLoggedInToIdentityAndAuthoritativeKeyserver } from 'lib/selectors/user-selectors.js';
 import {
   alertTypes,
   type RecordAlertActionPayload,
 } from 'lib/types/alert-types.js';
 import { useCurrentUserFID } from 'lib/utils/farcaster-utils.js';
 import { shouldSkipConnectFarcasterAlert } from 'lib/utils/push-alerts.js';
 import { useDispatch } from 'lib/utils/redux-utils.js';
 import sleep from 'lib/utils/sleep.js';
 
 import { ConnectFarcasterBottomSheetRouteName } from '../navigation/route-names.js';
 import { useSelector } from '../redux/redux-utils.js';
 
 function ConnectFarcasterAlertHandler(): React.Node {
   const { navigate } = useNavigation();
 
   const isActive = useSelector(state => state.lifecycleState !== 'background');
 
   const loggedIn = useSelector(isLoggedInToIdentityAndAuthoritativeKeyserver);
 
   const fid = useCurrentUserFID();
 
   const connectFarcasterAlertInfo = useSelector(
     state => state.alertStore.alertInfos[alertTypes.CONNECT_FARCASTER],
   );
 
   const dispatch = useDispatch();
 
   React.useEffect(() => {
     if (
       !loggedIn ||
       !isActive ||
-      !!fid ||
-      shouldSkipConnectFarcasterAlert(connectFarcasterAlertInfo)
+      shouldSkipConnectFarcasterAlert(connectFarcasterAlertInfo, fid)
     ) {
       return;
     }
 
     void (async () => {
       await sleep(1000);
 
       navigate(ConnectFarcasterBottomSheetRouteName);
 
       const payload: RecordAlertActionPayload = {
         alertType: alertTypes.CONNECT_FARCASTER,
         time: Date.now(),
       };
 
       dispatch({
         type: recordAlertActionType,
         payload,
       });
     })();
   }, [connectFarcasterAlertInfo, dispatch, fid, isActive, loggedIn, navigate]);
 
   return null;
 }
 
 export default ConnectFarcasterAlertHandler;