diff --git a/lib/modules/pool/actions/remove-liquidity/RemoveLiquidityProvider.tsx b/lib/modules/pool/actions/remove-liquidity/RemoveLiquidityProvider.tsx
index bc0abcbc1..4cf516a1a 100644
--- a/lib/modules/pool/actions/remove-liquidity/RemoveLiquidityProvider.tsx
+++ b/lib/modules/pool/actions/remove-liquidity/RemoveLiquidityProvider.tsx
@@ -15,7 +15,6 @@ import { useRemoveLiquidityPriceImpactQuery } from './queries/useRemoveLiquidity
 import { RemoveLiquidityType } from './remove-liquidity.types'
 import { Address, Hash } from 'viem'
 import { emptyTokenAmounts, toHumanAmount } from '../LiquidityActionHelpers'
-import { useDisclosure } from '@chakra-ui/hooks'
 import { getPoolTokens, isCowAmmPool } from '../../pool.helpers'
 import { isWrappedNativeAsset } from '@/lib/modules/tokens/token.helpers'
 import { useRemoveLiquiditySimulationQuery } from './queries/useRemoveLiquiditySimulationQuery'
@@ -23,6 +22,7 @@ import { useRemoveLiquiditySteps } from './useRemoveLiquiditySteps'
 import { useTransactionSteps } from '@/lib/modules/transactions/transaction-steps/useTransactionSteps'
 import { HumanTokenAmountWithAddress } from '@/lib/modules/tokens/token.types'
 import { getUserWalletBalance } from '../../user-balance.helpers'
+import { useModalWithPoolRedirect } from '../../useModalWithPoolRedirect'
 
 export type UseRemoveLiquidityResponse = ReturnType<typeof _useRemoveLiquidity>
 export const RemoveLiquidityContext = createContext<UseRemoveLiquidityResponse | null>(null)
@@ -46,7 +46,6 @@ export function _useRemoveLiquidity(urlTxHash?: Hash) {
   const { getToken, usdValueForToken, getNativeAssetToken, getWrappedNativeAssetToken } =
     useTokens()
   const { isConnected } = useUserAccount()
-  const previewModalDisclosure = useDisclosure()
 
   const maxHumanBptIn: HumanAmount = getUserWalletBalance(pool)
   const humanBptIn: HumanAmount = bn(maxHumanBptIn)
@@ -234,6 +233,8 @@ export function _useRemoveLiquidity(urlTxHash?: Hash) {
     transactionSteps.lastTransactionState,
   ])
 
+  const previewModalDisclosure = useModalWithPoolRedirect(pool, removeLiquidityTxHash)
+
   return {
     transactionSteps,
     tokens: tokensToShow(),
diff --git a/lib/modules/transactions/transaction-steps/TransactionStateProvider.tsx b/lib/modules/transactions/transaction-steps/TransactionStateProvider.tsx
index 31b9deb32..fa0a37708 100644
--- a/lib/modules/transactions/transaction-steps/TransactionStateProvider.tsx
+++ b/lib/modules/transactions/transaction-steps/TransactionStateProvider.tsx
@@ -19,6 +19,9 @@ export function _useTransactionState() {
       v = resetTransaction(v)
     }
 
+    // Avoid updating transaction if it's already successful (avoids unnecessary re-renders and side-effects)
+    if (getTransaction(k)?.result.status === 'success') return
+
     setTransactionMap(new Map(transactionMap.set(k, v)))
   }