diff --git a/apps/common/components/TokenDropdown.tsx b/apps/common/components/TokenDropdown.tsx
index 2f6e43f7d..55e499c95 100755
--- a/apps/common/components/TokenDropdown.tsx
+++ b/apps/common/components/TokenDropdown.tsx
@@ -105,7 +105,7 @@ export function Dropdown(props: TDropdownProps): ReactElement {
 						onClick={(): void => set_isOpen((o: boolean): boolean => !o)}
 						className={cl(
 							props.className,
-							'flex h-10 w-full items-center justify-between bg-neutral-0 p-2 text-base text-neutral-900 md:w-56 md:px-3'
+							'flex h-10 w-full items-center justify-between bg-neutral-0 p-2 text-base text-neutral-900 md:px-3'
 						)}>
 						<div className={'relative w-full'}>
 							<div className={'flex w-full items-center'}>
diff --git a/apps/vaults-v3/components/details/actions/QuickActionsFrom.tsx b/apps/vaults-v3/components/details/actions/QuickActionsFrom.tsx
index a23261af5..657443646 100644
--- a/apps/vaults-v3/components/details/actions/QuickActionsFrom.tsx
+++ b/apps/vaults-v3/components/details/actions/QuickActionsFrom.tsx
@@ -36,8 +36,8 @@ export function VaultDetailsQuickActionsFrom(): ReactElement {
 	function renderMultipleOptionsFallback(): ReactElement {
 		return (
 			<Dropdown
-				className={'!w-auto rounded-lg bg-neutral-300'}
-				comboboxOptionsClassName={'bg-neutral-300 rounded-lg'}
+				className={'!w-fit rounded-lg bg-neutral-300'}
+				comboboxOptionsClassName={'bg-neutral-300 rounded-lg w-full'}
 				defaultOption={possibleOptionsFrom[0]}
 				options={possibleOptionsFrom}
 				selected={actionParams?.selectedOptionFrom}
@@ -64,7 +64,7 @@ export function VaultDetailsQuickActionsFrom(): ReactElement {
 	return (
 		<section
 			id={isActive ? 'active' : 'not-active'}
-			className={'flex w-full flex-col space-x-0 md:flex-row md:space-x-4'}>
+			className={'grid w-full grid-cols-2 flex-col space-x-0 md:flex-row md:space-x-4'}>
 			<div className={'relative z-10 w-full'}>
 				<div className={'flex flex-col items-baseline justify-between pb-2 pl-1 md:flex-row'}>
 					<p className={'text-base text-neutral-600'}>{isDepositing ? 'From wallet' : 'From vault'}</p>
@@ -82,7 +82,7 @@ export function VaultDetailsQuickActionsFrom(): ReactElement {
 					fallback={renderMultipleOptionsFallback()}>
 					<div
 						className={
-							'flex h-10 w-full items-center justify-between rounded-lg bg-neutral-300 px-2 text-base text-neutral-900 md:w-56 md:px-3'
+							'flex h-10 w-full items-center justify-between rounded-lg bg-neutral-300 px-2 text-base text-neutral-900 md:px-3'
 						}>
 						<div className={'relative flex flex-row items-center truncate'}>
 							<div className={'h-6 w-6 flex-none rounded-full'}>{selectedFromIcon}</div>
diff --git a/apps/vaults-v3/components/details/actions/QuickActionsTo.tsx b/apps/vaults-v3/components/details/actions/QuickActionsTo.tsx
index 460dc2763..fca4eb68d 100644
--- a/apps/vaults-v3/components/details/actions/QuickActionsTo.tsx
+++ b/apps/vaults-v3/components/details/actions/QuickActionsTo.tsx
@@ -54,7 +54,7 @@ export function VaultDetailsQuickActionsTo(): ReactElement {
 					fallback={renderMultipleOptionsFallback()}>
 					<div
 						className={
-							'flex h-10 w-full items-center justify-between rounded-lg bg-neutral-300 px-2 text-base text-neutral-900 md:w-56 md:px-3'
+							'flex h-10 w-full items-center justify-between rounded-lg bg-neutral-300 px-2 text-base text-neutral-900 md:px-3'
 						}>
 						<div className={'relative flex flex-row items-center truncate'}>
 							<div className={'h-6 w-6 flex-none rounded-full'}>
diff --git a/apps/vaults-v3/components/list/VaultsListInternalMigrationRow.tsx b/apps/vaults-v3/components/list/VaultsListInternalMigrationRow.tsx
index 867b39a9c..aa86b3ba9 100755
--- a/apps/vaults-v3/components/list/VaultsListInternalMigrationRow.tsx
+++ b/apps/vaults-v3/components/list/VaultsListInternalMigrationRow.tsx
@@ -48,14 +48,14 @@ export function VaultsListInternalMigrationRow({currentVault}: {currentVault: TY
 					{'To keep earning yield on your assets, migrate to the current vault.'}
 				</div>
 
-				<div className={'mt-6 flex w-full items-center md:ml-auto md:mt-0 md:w-56 md:justify-end'}>
+				<div className={'mt-6 flex w-full items-center md:ml-auto md:mt-0 md:justify-end'}>
 					<Link
 						className={'w-full'}
 						href={`/vaults/${currentVault.chainID}/${toAddress(currentVault.address)}`}>
 						<button
 							className={cl(
 								'rounded-lg overflow-hidden flex',
-								'px-4 py-2 w-full md:w-56',
+								'px-4 py-2 w-full',
 								'relative group',
 								'border-none'
 							)}>
diff --git a/apps/vaults/components/details/actions/QuickActionsFrom.tsx b/apps/vaults/components/details/actions/QuickActionsFrom.tsx
index b52d8beb5..82ae56a4e 100644
--- a/apps/vaults/components/details/actions/QuickActionsFrom.tsx
+++ b/apps/vaults/components/details/actions/QuickActionsFrom.tsx
@@ -79,7 +79,7 @@ export function VaultDetailsQuickActionsFrom(): ReactElement {
 					fallback={renderMultipleOptionsFallback()}>
 					<div
 						className={
-							'flex h-10 w-full items-center justify-between bg-neutral-300 px-2 text-base text-neutral-900 md:w-56 md:px-3'
+							'flex h-10 w-full items-center justify-between bg-neutral-300 px-2 text-base text-neutral-900 md:px-3'
 						}>
 						<div className={'relative flex flex-row items-center truncate'}>
 							<div className={'h-6 w-6 flex-none rounded-full'}>{selectedFromIcon}</div>
diff --git a/apps/vaults/contexts/useActionFlow.tsx b/apps/vaults/contexts/useActionFlow.tsx
index 2f418cb8d..8ca716713 100644
--- a/apps/vaults/contexts/useActionFlow.tsx
+++ b/apps/vaults/contexts/useActionFlow.tsx
@@ -22,7 +22,6 @@ import {decodeAsBigInt} from '@yearn-finance/web-lib/utils/decoder';
 import {toBigInt, toNormalizedBN} from '@yearn-finance/web-lib/utils/format.bigNumber';
 import {isEth} from '@yearn-finance/web-lib/utils/isEth';
 import {isZero} from '@yearn-finance/web-lib/utils/isZero';
-import {performBatchedUpdates} from '@yearn-finance/web-lib/utils/performBatchedUpdates';
 import {getNetwork} from '@yearn-finance/web-lib/utils/wagmi/utils';
 import {useWallet} from '@common/contexts/useWallet';
 import {useYearn} from '@common/contexts/useYearn';
@@ -306,29 +305,27 @@ export function ActionFlowContextApp({
 			}
 
 			if (nextFlow === Flow.Switch) {
-				performBatchedUpdates((): void => {
-					const _selectedOptionTo = actionParams?.selectedOptionTo;
-					const _possibleOptionsTo = possibleOptionsTo;
-					let _selectedOptionFrom = actionParams?.selectedOptionFrom;
-					if (isDepositing && (actionParams?.selectedOptionFrom?.solveVia || []).length > 0) {
-						// We don't want to be able to withdraw to exotic tokens. If the current from is one of them, take another one.
-						_selectedOptionFrom = possibleOptionsFrom.find(
-							(option: TDropdownOption): boolean =>
-								option.value !== actionParams?.selectedOptionFrom?.value &&
-								isZero((option.solveVia || []).length)
-						);
+				const _selectedOptionTo = actionParams?.selectedOptionTo;
+				const _possibleOptionsTo = possibleOptionsTo;
+				let _selectedOptionFrom = actionParams?.selectedOptionFrom;
+				if (isDepositing && (actionParams?.selectedOptionFrom?.solveVia || []).length > 0) {
+					// We don't want to be able to withdraw to exotic tokens. If the current from is one of them, take another one.
+					_selectedOptionFrom = possibleOptionsFrom.find(
+						(option: TDropdownOption): boolean =>
+							option.value !== actionParams?.selectedOptionFrom?.value &&
+							isZero((option.solveVia || []).length)
+					);
+				}
+				actionParamsDispatcher({
+					type: 'all',
+					payload: {
+						selectedOptionFrom: _selectedOptionTo,
+						selectedOptionTo: _selectedOptionFrom,
+						amount: isDepositing ? toNormalizedBN(0) : maxDepositPossible
 					}
-					actionParamsDispatcher({
-						type: 'all',
-						payload: {
-							selectedOptionFrom: _selectedOptionTo,
-							selectedOptionTo: _selectedOptionFrom,
-							amount: isDepositing ? toNormalizedBN(0) : maxDepositPossible
-						}
-					});
-					set_possibleOptionsTo(possibleOptionsFrom);
-					set_possibleOptionsFrom(_possibleOptionsTo);
 				});
+				set_possibleOptionsTo(possibleOptionsFrom);
+				set_possibleOptionsFrom(_possibleOptionsTo);
 			}
 
 			const vaultUnderlying = setZapOption({
diff --git a/apps/vaults/contexts/useSolver.tsx b/apps/vaults/contexts/useSolver.tsx
index eb0a15325..8a29de35d 100644
--- a/apps/vaults/contexts/useSolver.tsx
+++ b/apps/vaults/contexts/useSolver.tsx
@@ -12,7 +12,6 @@ import {serialize} from '@wagmi/core';
 import {useWeb3} from '@yearn-finance/web-lib/contexts/useWeb3';
 import {toAddress} from '@yearn-finance/web-lib/utils/address';
 import {toNormalizedBN} from '@yearn-finance/web-lib/utils/format.bigNumber';
-import {performBatchedUpdates} from '@yearn-finance/web-lib/utils/performBatchedUpdates';
 import {Solver} from '@common/schemas/yDaemonTokenListBalances';
 import {hash} from '@common/utils';
 
@@ -80,14 +79,12 @@ export function WithSolverContextApp({children}: {children: React.ReactElement})
 				return;
 			}
 			const requestHash = await hash(serialize({...request, solver, expectedOut: quote.value.raw}));
-			performBatchedUpdates((): void => {
-				set_currentSolverState({
-					...ctx,
-					quote: quote.value,
-					hash: requestHash
-				});
-				set_isLoading(false);
+			set_currentSolverState({
+				...ctx,
+				quote: quote.value,
+				hash: requestHash
 			});
+			set_isLoading(false);
 		},
 		[executionNonce]
 	);
@@ -104,6 +101,10 @@ export function WithSolverContextApp({children}: {children: React.ReactElement})
 			) {
 				return;
 			}
+			if (actionParams.amount.raw === 0n) {
+				return set_currentSolverState({...vanilla, quote: toNormalizedBN(0)});
+			}
+
 			set_isLoading(true);
 
 			const request: TInitSolverArgs = {
@@ -263,6 +264,9 @@ export function WithSolverContextApp({children}: {children: React.ReactElement})
 			actionParams.selectedOptionFrom,
 			actionParams.selectedOptionTo,
 			actionParams.amount.raw,
+			currentVault.chainID,
+			currentVault.version,
+			currentVault.migration.contract,
 			address,
 			isDepositing,
 			currentSolver,
@@ -274,7 +278,6 @@ export function WithSolverContextApp({children}: {children: React.ReactElement})
 			optimismBooster,
 			chainCoin,
 			partnerContract,
-			currentVault.migration.contract,
 			internalMigration
 		]
 	);