diff --git a/src/components/Transfer/Source.tsx b/src/components/Transfer/Source.tsx
index bc41e795f..219d1cee4 100644
--- a/src/components/Transfer/Source.tsx
+++ b/src/components/Transfer/Source.tsx
@@ -110,7 +110,7 @@ function Source() {
   const error = useSelector(selectTransferSourceError);
   const isSourceComplete = useSelector(selectTransferIsSourceComplete);
   const shouldLockFields = useSelector(selectTransferShouldLockFields);
-  const { isReady, statusMessage } = useIsWalletReady(sourceChain);
+  const { isReady, statusMessage, walletAddress } = useIsWalletReady(sourceChain);
   const isTransferLimited = useIsTransferLimited();
   const handleMigrationClick = useCallback(() => {
     if (sourceChain === CHAIN_ID_ETH) {
@@ -226,7 +226,7 @@ function Source() {
         </div>
       </div>
       <KeyAndBalance chainId={sourceChain} />
-      {isReady || uiAmountString ? (
+      {((isReady || uiAmountString) && !!walletAddress) ? (
         <div className={classes.transferField}>
           <TokenSelector disabled={shouldLockFields} />
         </div>
@@ -250,7 +250,7 @@ function Source() {
             sourceChain={sourceChain}
             sourceAsset={parsedTokenAccount?.mintKey}
           />
-          {hasParsedTokenAccount ? (
+          {(hasParsedTokenAccount && !!walletAddress) ? (
             <NumberTextField
               variant="outlined"
               label="Amount"