diff --git a/src/app/(setup)/setup/page.tsx b/src/app/(setup)/setup/page.tsx
index 600e2667a..325a62f8a 100644
--- a/src/app/(setup)/setup/page.tsx
+++ b/src/app/(setup)/setup/page.tsx
@@ -170,22 +170,7 @@ export default function SetupPage() {
         )
     }
 
-    if (showDeviceNotSupportedModal) {
-        return (
-            <ActionModal
-                visible={true}
-                onClose={() => {}} // no action on close for this modal
-                title="Device not supported!"
-                description="This device doesn't support some of the technologies Peanut needs to work properly. Please try opening this link on a newer phone."
-                icon={'alert' as IconName}
-                preventClose={true}
-                hideModalCloseButton={true}
-                ctas={[]}
-            />
-        )
-    }
-
-    if (showBrowserNotSupportedModal) {
+    if (showBrowserNotSupportedModal || showDeviceNotSupportedModal) {
         return <UnsupportedBrowserModal visible={true} allowClose={false} />
     }
 
diff --git a/src/components/AddWithdraw/AddWithdrawRouterView.tsx b/src/components/AddWithdraw/AddWithdrawRouterView.tsx
index b010cfb5f..b531748ff 100644
--- a/src/components/AddWithdraw/AddWithdrawRouterView.tsx
+++ b/src/components/AddWithdraw/AddWithdrawRouterView.tsx
@@ -62,7 +62,10 @@ export const AddWithdrawRouterView: FC<AddWithdrawRouterViewProps> = ({
         setIsLoadingPreferences(true)
         if (flow === 'withdraw') {
             const bankAccounts =
-                user?.accounts.filter((acc) => acc.type === AccountType.IBAN || acc.type === AccountType.US) ?? []
+                user?.accounts.filter(
+                    (acc) =>
+                        acc.type === AccountType.IBAN || acc.type === AccountType.US || acc.type === AccountType.CLABE
+                ) ?? []
 
             if (bankAccounts.length > 0) {
                 setSavedAccounts(bankAccounts as unknown as Account[])