diff --git a/packages/wallets/src/components/WalletSend.tsx b/packages/wallets/src/components/WalletSend.tsx
index 7dc2d1a2a5..c53d0fbac1 100644
--- a/packages/wallets/src/components/WalletSend.tsx
+++ b/packages/wallets/src/components/WalletSend.tsx
@@ -40,7 +40,6 @@ type SendCardProps = {
 
 type SendTransactionData = {
   address: string;
-  addressAuto: string;
   amount: string;
   fee: string;
   memo: string;
@@ -69,7 +68,6 @@ export default function WalletSend(props: SendCardProps) {
   const methods = useForm<SendTransactionData>({
     defaultValues: {
       address: '',
-      addressAuto: '',
       amount: '',
       fee: '',
       memo: '',
diff --git a/packages/wallets/src/components/cat/WalletCATSend.tsx b/packages/wallets/src/components/cat/WalletCATSend.tsx
index 95d9f7ee26..9688561106 100644
--- a/packages/wallets/src/components/cat/WalletCATSend.tsx
+++ b/packages/wallets/src/components/cat/WalletCATSend.tsx
@@ -27,6 +27,7 @@ import isNumeric from 'validator/es/lib/isNumeric';
 
 import useWallet from '../../hooks/useWallet';
 import useWalletState from '../../hooks/useWalletState';
+import AddressBookAutocomplete from '../AddressBookAutocomplete';
 import CreateWalletSendTransactionResultDialog from '../WalletSendTransactionResultDialog';
 
 type Props = {
@@ -187,15 +188,13 @@ export default function WalletCATSend(props: Props) {
         <Card>
           <Grid spacing={2} container>
             <Grid xs={12} item>
-              <TextField
+              <AddressBookAutocomplete
                 name="address"
+                getType="address"
+                freeSolo
                 variant="filled"
-                color="secondary"
-                fullWidth
-                disabled={isSubmitting}
-                label={<Trans>Address / Puzzle hash</Trans>}
-                data-testid="WalletCATSend-address"
                 required
+                disabled={isSubmitting}
               />
             </Grid>
             <Grid xs={12} md={6} item>