diff --git a/src/pages/RFOX/components/AddressSelection.tsx b/src/pages/RFOX/components/AddressSelection.tsx
index 7a5ed4b7d10..b718f3165ad 100644
--- a/src/pages/RFOX/components/AddressSelection.tsx
+++ b/src/pages/RFOX/components/AddressSelection.tsx
@@ -254,6 +254,12 @@ export const AddressSelection: FC<AddressSelectionProps> = ({
     return fromAccountId(maybeRuneAccountId).account
   }, [maybeRuneAccountId])
 
+  useEffect(() => {
+    if (maybeSelectedRuneAddress && !selectedAddress) {
+      handleRuneAddressChange(maybeSelectedRuneAddress)
+    }
+  }, [maybeSelectedRuneAddress, selectedAddress, handleRuneAddressChange])
+
   const filter = useMemo(() => ({ accountId: maybeRuneAccountId }), [maybeRuneAccountId])
   const accountNumber = useAppSelector(state => selectAccountNumberByAccountId(state, filter))