@@ -183,6 +183,7 @@ export const ATPStakingOverview = ({ atpData, walletBalance = 0n }: ATPStakingOv
               decimals={decimals}
               symbol={symbol}
               delegationBreakdown={delegationBreakdown}
+              erc20DelegationBreakdown={erc20DelegationBreakdown}
               coinbaseBreakdown={coinbaseBreakdown}
               onClaimSuccess={() => {
                 refetchAggregatedData()
 
@@ -4,7 +4,7 @@ import { TooltipIcon } from "@/components/Tooltip"
 import { formatTokenAmount, formatTokenAmountFull } from "@/utils/atpFormatters"
 import { ManageRewardsAddressesModal } from "@/components/RewardsManagement"
 import { ClaimAllRewardsModal } from "@/components/ClaimAllRewardsModal"
-import type { DelegationBreakdown } from "@/hooks/atp/useAggregatedStakingData"
+import type { DelegationBreakdown, Erc20DelegationBreakdown } from "@/hooks/atp/useAggregatedStakingData"
 import type { CoinbaseBreakdown } from "@/hooks/rewards/rewardsTypes"
 
 interface ATPStakingOverviewClaimableRewardsProps {
@@ -17,6 +17,7 @@ interface ATPStakingOverviewClaimableRewardsProps {
   decimals: number
   symbol: string
   delegationBreakdown?: DelegationBreakdown[]
+  erc20DelegationBreakdown?: Erc20DelegationBreakdown[]
   coinbaseBreakdown?: CoinbaseBreakdown[]
   onClaimSuccess?: () => void
 }
@@ -25,7 +26,7 @@ interface ATPStakingOverviewClaimableRewardsProps {
  * Displays claimable delegation rewards and self-stake rewards
  */
 export const ATPStakingOverviewClaimableRewards = forwardRef<HTMLDivElement, ATPStakingOverviewClaimableRewardsProps>(
-  ({ totalRewards, selfStakeRewards = 0n, pendingWarehouseWithdrawal = 0n, isRewardsClaimable = true, isExpanded, onToggle, decimals, symbol, delegationBreakdown = [], coinbaseBreakdown = [], onClaimSuccess }, ref) => {
+  ({ totalRewards, selfStakeRewards = 0n, pendingWarehouseWithdrawal = 0n, isRewardsClaimable = true, isExpanded, onToggle, decimals, symbol, delegationBreakdown = [], erc20DelegationBreakdown = [], coinbaseBreakdown = [], onClaimSuccess }, ref) => {
     const [isManageModalOpen, setIsManageModalOpen] = useState(false)
     const [isClaimAllModalOpen, setIsClaimAllModalOpen] = useState(false)
 
@@ -193,6 +194,7 @@ export const ATPStakingOverviewClaimableRewards = forwardRef<HTMLDivElement, ATP
           isOpen={isClaimAllModalOpen}
           onClose={() => setIsClaimAllModalOpen(false)}
           delegations={delegationBreakdown}
+          erc20Delegations={erc20DelegationBreakdown}
           coinbases={coinbaseBreakdown}
           pendingWarehouseWithdrawal={pendingWarehouseWithdrawal}
           onSuccess={onClaimSuccess}
 
@@ -8,6 +8,7 @@ import {
   buildDelegationClaimEntries,
   buildWarehouseWithdrawEntry,
   getRecoveryDustThreshold,
+  resolveWarehouseSplit,
   type ClaimCartEntry,
 } from "@/utils/claimCart"
 import { Icon } from "@/components/Icon"
@@ -63,8 +64,9 @@ export const ClaimAllDelegationRewardsButton = ({
   const { isRewardsClaimable } = useIsRewardsClaimable()
   const { addTransaction, checkTransactionInQueue, openCart, replaceTransactionByTx } = useTransactionCart()
 
-  // Warehouse is the same per-token across all delegations; resolve from the first one.
-  const firstSplit = delegations[0]?.splitContract
+  // Warehouse is the same per-token across all delegations; resolve from the
+  // first one that has a split contract.
+  const firstSplit = resolveWarehouseSplit(delegations)
   const { warehouseAddress } = useSplitsWarehouse(firstSplit)
 
   // Filter to delegations that have *anything* claimable — canonical, stranded
 
@@ -12,15 +12,17 @@ import {
   buildCoinbaseClaimEntry,
   buildWarehouseWithdrawEntry,
   getRecoveryDustThreshold,
+  resolveWarehouseSplit,
   type ClaimCartEntry,
 } from "@/utils/claimCart"
-import type { DelegationBreakdown } from "@/hooks/atp/useAggregatedStakingData"
+import type { DelegationBreakdown, Erc20DelegationBreakdown } from "@/hooks/atp/useAggregatedStakingData"
 import type { CoinbaseBreakdown } from "@/hooks/rewards/rewardsTypes"
 
 interface ClaimAllRewardsModalProps {
   isOpen: boolean
   onClose: () => void
   delegations: DelegationBreakdown[]
+  erc20Delegations?: Erc20DelegationBreakdown[]
   coinbases: CoinbaseBreakdown[]
   pendingWarehouseWithdrawal?: bigint
   onSuccess?: () => void
@@ -37,6 +39,7 @@ export const ClaimAllRewardsModal = ({
   isOpen,
   onClose,
   delegations,
+  erc20Delegations = [],
   coinbases,
   pendingWarehouseWithdrawal = 0n,
   onSuccess,
@@ -47,9 +50,12 @@ export const ClaimAllRewardsModal = ({
   const { addTransaction, openCart, replaceTransactionByTx } = useTransactionCart()
   const { showAlert } = useAlert()
 
-  // Resolve warehouse via the first delegation's split contract. All splits
-  // funnel into the same SplitsWarehouse for a given token, so any split works.
-  const firstSplit = delegations.find((d) => d.rewards > 0n)?.splitContract ?? delegations[0]?.splitContract
+  // Prefer a split that has rewards, then fall back to any of the user's
+  // splits, ATP or wallet. Without the wallet fallback the warehouse address
+  // is undefined and the withdraw leg below is skipped, leaving an empty cart.
+  const firstSplit =
+    delegations.find((d) => d.rewards > 0n)?.splitContract
+    ?? resolveWarehouseSplit(delegations, erc20Delegations)
   const { warehouseAddress } = useSplitsWarehouse(firstSplit)
 
   const handleAddAllToBatch = () => {
 
@@ -6,6 +6,7 @@ import { ERC20Abi } from '@/contracts/abis/ERC20'
 import { SplitAbi } from '@/contracts/abis/Split'
 import { SplitWarehouseAbi } from '@/contracts/abis/SplitWarehouse'
 import { calculateTotalUserShareFromSplitRewards } from '@/utils/rewardCalculations'
+import { resolveWarehouseSplit } from '@/utils/claimCart'
 import { useFeeAssetTokenDetails } from '@/hooks/rollup'
 import { contracts, getRollupVersions, type RollupVersion } from '@/contracts'
 import type { Address } from 'viem'
@@ -519,8 +520,8 @@ export const useAggregatedStakingData = (): AggregatedStakingData => {
     },
   })
 
-  // Get warehouse address from first split contract (all splits use the same warehouse)
-  const firstSplitContract = delegations[0]?.splitContract as Address | undefined
+  // Resolve the warehouse from any of the user's splits, ATP or wallet.
+  const firstSplitContract = resolveWarehouseSplit(delegations, erc20Delegations)
   const { data: warehouseAddress } = useReadContract({
     address: firstSplitContract,
     abi: SplitAbi,
 
@@ -80,6 +80,25 @@ export function getRecoveryDustThreshold(decimals: number): bigint {
   return decimals >= 1 ? RECOVERY_DUST_THRESHOLD_NUMERATOR * 10n ** BigInt(decimals - 1) : 0n
 }
 
+/**
+ * Pick a split contract to resolve the SplitsWarehouse address from.
+ *
+ * Every split funnels into the same warehouse for a given token, so any one of
+ * the user's splits answers the question. The lists are tried in order, which
+ * matters because a delegator who stakes only from a wallet has no ATP
+ * delegations: reading just the first list left the address undefined and
+ * silently disabled every warehouse read and withdraw for them.
+ */
+export function resolveWarehouseSplit(
+  ...delegationLists: Array<ReadonlyArray<{ splitContract?: string }> | undefined>
+): Address | undefined {
+  for (const list of delegationLists) {
+    const found = list?.find((d) => d?.splitContract)?.splitContract
+    if (found) return found as Address
+  }
+  return undefined
+}
+
 export interface DelegationClaimResult {
   entries: ClaimCartEntry[]
   /** `stepGroupIdentifier` of the delegation's distribute step. Pass to