diff --git a/landing/connect-farcaster.react.js b/landing/connect-farcaster.react.js
index ed089447a..ae3add538 100644
--- a/landing/connect-farcaster.react.js
+++ b/landing/connect-farcaster.react.js
@@ -1,90 +1,86 @@
 // @flow
 
 import { AuthKitProvider, useSignIn } from '@farcaster/auth-kit';
 import * as React from 'react';
 
 import type { FarcasterWebViewMessage } from 'lib/types/farcaster-types.js';
 
 const config = {
   domain: 'Comm',
   siweURL: 'https://comm.app/connect-farcaster',
   rpcURL: 'https://mainnet.optimism.io',
   relay: 'https://relay.farcaster.xyz',
   redirectUrl: 'comm://back-from-warpcast',
 };
 
 function postMessageToNativeWebView(message: FarcasterWebViewMessage) {
   window.ReactNativeWebView?.postMessage?.(JSON.stringify(message));
 }
 
 type OnSuccessCallbackArgs = {
   fid: string,
 };
 function onSuccessCallback({ fid }: OnSuccessCallbackArgs) {
   postMessageToNativeWebView({
     type: 'farcaster_data',
     fid: fid.toString(),
   });
 }
 
 function ConnectFarcaster(): React.Node {
   const signInState = useSignIn({ onSuccess: onSuccessCallback });
 
   const {
     signIn,
     connect,
     reconnect,
     isSuccess,
     isError,
     channelToken,
     url,
     validSignature,
   } = signInState;
 
-  React.useEffect(() => {
-    if (!channelToken) {
-      connect();
-    }
-  }, [channelToken, connect]);
-
   const messageSentRef = React.useRef<boolean>(false);
   const authenticated = isSuccess && validSignature;
 
   React.useEffect(() => {
     if (authenticated) {
       return;
     }
     if (isError) {
       messageSentRef.current = false;
       reconnect();
+    } else if (!channelToken) {
+      connect();
     }
 
     signIn();
 
     if (url && messageSentRef.current === false) {
       messageSentRef.current = true;
 
       postMessageToNativeWebView({
         type: 'farcaster_url',
         url: url.toString(),
       });
     }
-  }, [authenticated, isError, reconnect, signIn, url]);
+  }, [authenticated, isError, reconnect, channelToken, connect, signIn, url]);
 
   return null;
 }
 
 function ConnectFarcasterWrapper(): React.Node {
   const connectFarcasterWrapper = React.useMemo(
     () => (
       <AuthKitProvider config={config}>
         <ConnectFarcaster />
       </AuthKitProvider>
     ),
     [],
   );
 
   return connectFarcasterWrapper;
 }
 
 export default ConnectFarcasterWrapper;