diff --git a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
index cb3a8924..47625c0d 100644
--- a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
+++ b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
@@ -1 +1 @@
-129542
\ No newline at end of file
+129534
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
index 7274089d..f3484bc7 100644
--- a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
+++ b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
@@ -1 +1 @@
-131456
\ No newline at end of file
+131448
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
index bce4817b..7d351c87 100644
--- a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
+++ b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
@@ -1 +1 @@
-123661
\ No newline at end of file
+123653
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
index b7ad30f4..113b5817 100644
--- a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
+++ b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
@@ -1 +1 @@
-123803
\ No newline at end of file
+123795
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
index 571f09c3..95650a1e 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
@@ -1 +1 @@
-158871
\ No newline at end of file
+158857
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
index f673e901..66be8c41 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
@@ -1 +1 @@
-157823
\ No newline at end of file
+157809
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
index 109715cd..e559220c 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
@@ -1 +1 @@
-140808
\ No newline at end of file
+142121
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_native.snap b/.forge-snapshots/PositionManager_mint_native.snap
index a392537d..86b73c4d 100644
--- a/.forge-snapshots/PositionManager_mint_native.snap
+++ b/.forge-snapshots/PositionManager_mint_native.snap
@@ -1 +1 @@
-364681
\ No newline at end of file
+365994
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
index 012d5b88..bb299253 100644
--- a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
+++ b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
@@ -1 +1 @@
-373199
\ No newline at end of file
+374512
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
index a732cefe..f3ab1f4e 100644
--- a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
@@ -1 +1 @@
-372435
\ No newline at end of file
+373748
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
index 31a541af..0aff1998 100644
--- a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
+++ b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
@@ -1 +1 @@
-317431
\ No newline at end of file
+317417
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
index b634faa2..6a260258 100644
--- a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
+++ b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
@@ -1 +1 @@
-318101
\ No newline at end of file
+318087
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_sameRange.snap b/.forge-snapshots/PositionManager_mint_sameRange.snap
index 30212869..8c4f5a35 100644
--- a/.forge-snapshots/PositionManager_mint_sameRange.snap
+++ b/.forge-snapshots/PositionManager_mint_sameRange.snap
@@ -1 +1 @@
-243670
\ No newline at end of file
+243656
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
index 681c6d51..2d831268 100644
--- a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
+++ b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
@@ -1 +1 @@
-418878
\ No newline at end of file
+418864
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
index a1b50bf7..d4011d6c 100644
--- a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
+++ b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
@@ -1 +1 @@
-323462
\ No newline at end of file
+323448
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_withClose.snap b/.forge-snapshots/PositionManager_mint_withClose.snap
index 8251054a..33db8cb9 100644
--- a/.forge-snapshots/PositionManager_mint_withClose.snap
+++ b/.forge-snapshots/PositionManager_mint_withClose.snap
@@ -1 +1 @@
-419984
\ No newline at end of file
+419970
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_withSettlePair.snap b/.forge-snapshots/PositionManager_mint_withSettlePair.snap
index b425567a..4605a1b6 100644
--- a/.forge-snapshots/PositionManager_mint_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_mint_withSettlePair.snap
@@ -1 +1 @@
-419054
\ No newline at end of file
+419040
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
index 617f2034..79b9364c 100644
--- a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
+++ b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
@@ -1 +1 @@
-455828
\ No newline at end of file
+455814
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_Bytecode.snap b/.forge-snapshots/V4Router_Bytecode.snap
index 64b24d8a..ff36c218 100644
--- a/.forge-snapshots/V4Router_Bytecode.snap
+++ b/.forge-snapshots/V4Router_Bytecode.snap
@@ -1 +1 @@
-7007
\ No newline at end of file
+6929
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
index a9a2feec..89a7062a 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
@@ -1 +1 @@
-117265
\ No newline at end of file
+118538
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap b/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
index dbf08c80..8e073c7b 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
@@ -1 +1 @@
-117522
\ No newline at end of file
+117514
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap b/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
index ae7b1c4e..8768af82 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
@@ -1 +1 @@
-126337
\ No newline at end of file
+126329
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap b/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
index b85186e7..857cd65f 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
@@ -1 +1 @@
-132001
\ No newline at end of file
+131993
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn2Hops.snap b/.forge-snapshots/V4Router_ExactIn2Hops.snap
index e5992b07..8208b8fd 100644
--- a/.forge-snapshots/V4Router_ExactIn2Hops.snap
+++ b/.forge-snapshots/V4Router_ExactIn2Hops.snap
@@ -1 +1 @@
-186735
\ No newline at end of file
+186727
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
index 17554adc..a8dff7ad 100644
--- a/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
@@ -1 +1 @@
-171999
\ No newline at end of file
+173272
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn3Hops.snap b/.forge-snapshots/V4Router_ExactIn3Hops.snap
index e42451ba..8cfcd044 100644
--- a/.forge-snapshots/V4Router_ExactIn3Hops.snap
+++ b/.forge-snapshots/V4Router_ExactIn3Hops.snap
@@ -1 +1 @@
-241519
\ No newline at end of file
+241511
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
index 55f78227..03156f8e 100644
--- a/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
@@ -1 +1 @@
-226783
\ No newline at end of file
+228056
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle.snap b/.forge-snapshots/V4Router_ExactInputSingle.snap
index 78a778cc..618bac70 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle.snap
@@ -1 +1 @@
-131009
\ No newline at end of file
+131001
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap b/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
index ba9f8ca6..7b5725f6 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
@@ -1 +1 @@
-116273
\ No newline at end of file
+117546
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap b/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
index ca42bde5..dc2287e0 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
@@ -1 +1 @@
-116498
\ No newline at end of file
+116490
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap b/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
index f5d88c2f..93d27d56 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
@@ -1 +1 @@
-123523
\ No newline at end of file
+124796
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap b/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
index 39f69af2..833a13b6 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
@@ -1 +1 @@
-118595
\ No newline at end of file
+118587
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap b/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
index de15f842..4e2d3a67 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
@@ -1 +1 @@
-127410
\ No newline at end of file
+127402
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap b/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
index 171978b3..7c9c6431 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
@@ -1 +1 @@
-131282
\ No newline at end of file
+131274
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut2Hops.snap b/.forge-snapshots/V4Router_ExactOut2Hops.snap
index bcd78abe..8b726968 100644
--- a/.forge-snapshots/V4Router_ExactOut2Hops.snap
+++ b/.forge-snapshots/V4Router_ExactOut2Hops.snap
@@ -1 +1 @@
-185073
\ No newline at end of file
+185065
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
index 02386052..a1149e4c 100644
--- a/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
@@ -1 +1 @@
-177314
\ No newline at end of file
+178587
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops.snap b/.forge-snapshots/V4Router_ExactOut3Hops.snap
index c27e36f6..4180aab4 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops.snap
@@ -1 +1 @@
-238942
\ No newline at end of file
+238934
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
index eaf35aca..31d26829 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
@@ -1 +1 @@
-231183
\ No newline at end of file
+232456
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap b/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
index 600109db..0333b3b3 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
@@ -1 +1 @@
-218519
\ No newline at end of file
+218511
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle.snap b/.forge-snapshots/V4Router_ExactOutputSingle.snap
index 204f362d..bc9803a5 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle.snap
@@ -1 +1 @@
-130287
\ No newline at end of file
+130279
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap b/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
index c8d65c56..3a68556f 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
@@ -1 +1 @@
-122528
\ No newline at end of file
+123801
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap b/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
index eb34179d..ea119d57 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
@@ -1 +1 @@
-117674
\ No newline at end of file
+117666
\ No newline at end of file
diff --git a/src/base/DeltaResolver.sol b/src/base/DeltaResolver.sol
index 85fd1212..be7e48e7 100644
--- a/src/base/DeltaResolver.sol
+++ b/src/base/DeltaResolver.sol
@@ -37,10 +37,11 @@ abstract contract DeltaResolver is ImmutableState {
     /// @dev Returns early if the amount is 0
     function _settle(Currency currency, address payer, uint256 amount) internal {
         if (amount == 0) return;
+
+        poolManager.sync(currency);
         if (currency.isAddressZero()) {
             poolManager.settle{value: amount}();
         } else {
-            poolManager.sync(currency);
             _pay(currency, payer, amount);
             poolManager.settle();
         }