diff --git a/.forge-snapshots/SwapMath_oneForZero_exactInCapped.snap b/.forge-snapshots/SwapMath_oneForZero_exactInCapped.snap
index 2d11875e8..27d48e9a4 100644
--- a/.forge-snapshots/SwapMath_oneForZero_exactInCapped.snap
+++ b/.forge-snapshots/SwapMath_oneForZero_exactInCapped.snap
@@ -1 +1 @@
-1961
\ No newline at end of file
+1947
\ No newline at end of file
diff --git a/.forge-snapshots/SwapMath_oneForZero_exactInPartial.snap b/.forge-snapshots/SwapMath_oneForZero_exactInPartial.snap
index cebceba23..decfddd46 100644
--- a/.forge-snapshots/SwapMath_oneForZero_exactInPartial.snap
+++ b/.forge-snapshots/SwapMath_oneForZero_exactInPartial.snap
@@ -1 +1 @@
-2468
\ No newline at end of file
+2390
\ No newline at end of file
diff --git a/.forge-snapshots/SwapMath_oneForZero_exactOutCapped.snap b/.forge-snapshots/SwapMath_oneForZero_exactOutCapped.snap
index 640e39f73..f2b2a17d5 100644
--- a/.forge-snapshots/SwapMath_oneForZero_exactOutCapped.snap
+++ b/.forge-snapshots/SwapMath_oneForZero_exactOutCapped.snap
@@ -1 +1 @@
-1700
\ No newline at end of file
+1686
\ No newline at end of file
diff --git a/.forge-snapshots/SwapMath_oneForZero_exactOutPartial.snap b/.forge-snapshots/SwapMath_oneForZero_exactOutPartial.snap
index 7a99ca209..2a9d55ff3 100644
--- a/.forge-snapshots/SwapMath_oneForZero_exactOutPartial.snap
+++ b/.forge-snapshots/SwapMath_oneForZero_exactOutPartial.snap
@@ -1 +1 @@
-2956
\ No newline at end of file
+2831
\ No newline at end of file
diff --git a/.forge-snapshots/SwapMath_zeroForOne_exactInCapped.snap b/.forge-snapshots/SwapMath_zeroForOne_exactInCapped.snap
index 6fc392cbe..0f14524db 100644
--- a/.forge-snapshots/SwapMath_zeroForOne_exactInCapped.snap
+++ b/.forge-snapshots/SwapMath_zeroForOne_exactInCapped.snap
@@ -1 +1 @@
-2073
\ No newline at end of file
+2059
\ No newline at end of file
diff --git a/.forge-snapshots/SwapMath_zeroForOne_exactInPartial.snap b/.forge-snapshots/SwapMath_zeroForOne_exactInPartial.snap
index e8c402dfa..c1c401ac5 100644
--- a/.forge-snapshots/SwapMath_zeroForOne_exactInPartial.snap
+++ b/.forge-snapshots/SwapMath_zeroForOne_exactInPartial.snap
@@ -1 +1 @@
-3021
\ No newline at end of file
+2941
\ No newline at end of file
diff --git a/.forge-snapshots/SwapMath_zeroForOne_exactOutCapped.snap b/.forge-snapshots/SwapMath_zeroForOne_exactOutCapped.snap
index d9bc155cc..514744644 100644
--- a/.forge-snapshots/SwapMath_zeroForOne_exactOutCapped.snap
+++ b/.forge-snapshots/SwapMath_zeroForOne_exactOutCapped.snap
@@ -1 +1 @@
-1812
\ No newline at end of file
+1798
\ No newline at end of file
diff --git a/.forge-snapshots/SwapMath_zeroForOne_exactOutPartial.snap b/.forge-snapshots/SwapMath_zeroForOne_exactOutPartial.snap
index c823a08e0..f82e7a710 100644
--- a/.forge-snapshots/SwapMath_zeroForOne_exactOutPartial.snap
+++ b/.forge-snapshots/SwapMath_zeroForOne_exactOutPartial.snap
@@ -1 +1 @@
-2554
\ No newline at end of file
+2458
\ No newline at end of file
diff --git a/.forge-snapshots/add liquidity to already existing position with salt.snap b/.forge-snapshots/add liquidity to already existing position with salt.snap
index 343815cf2..72e473eac 100644
--- a/.forge-snapshots/add liquidity to already existing position with salt.snap	
+++ b/.forge-snapshots/add liquidity to already existing position with salt.snap	
@@ -1 +1 @@
-150602
\ No newline at end of file
+150588
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity CA fee.snap b/.forge-snapshots/addLiquidity CA fee.snap
index 2f20072e4..dd6a197ea 100644
--- a/.forge-snapshots/addLiquidity CA fee.snap	
+++ b/.forge-snapshots/addLiquidity CA fee.snap	
@@ -1 +1 @@
-327348
\ No newline at end of file
+327334
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
index c5b270b1d..06830585d 100644
--- a/.forge-snapshots/addLiquidity with empty hook.snap	
+++ b/.forge-snapshots/addLiquidity with empty hook.snap	
@@ -1 +1 @@
-281462
\ No newline at end of file
+281448
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
index 109715cd0..6d1426690 100644
--- a/.forge-snapshots/addLiquidity with native token.snap	
+++ b/.forge-snapshots/addLiquidity with native token.snap	
@@ -1 +1 @@
-140808
\ No newline at end of file
+140794
\ No newline at end of file
diff --git a/.forge-snapshots/create new liquidity to a position with salt.snap b/.forge-snapshots/create new liquidity to a position with salt.snap
index 891ac1072..fae205c08 100644
--- a/.forge-snapshots/create new liquidity to a position with salt.snap	
+++ b/.forge-snapshots/create new liquidity to a position with salt.snap	
@@ -1 +1 @@
-298780
\ No newline at end of file
+298766
\ No newline at end of file
diff --git a/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse.snap b/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse.snap
index 1dd3380cd..99f9f071d 100644
--- a/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse.snap
+++ b/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse.snap
@@ -1 +1 @@
-516
\ No newline at end of file
+502
\ No newline at end of file
diff --git a/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap b/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap
index 738359326..a869e998c 100644
--- a/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap
+++ b/.forge-snapshots/getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue.snap
@@ -1 +1 @@
-652
\ No newline at end of file
+638
\ No newline at end of file
diff --git a/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas.snap b/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas.snap
index 23c5f49dc..e157b5b5f 100644
--- a/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas.snap
+++ b/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas.snap
@@ -1 +1 @@
-572
\ No newline at end of file
+520
\ No newline at end of file
diff --git a/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas.snap b/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas.snap
index 475fbacb4..6bd680a65 100644
--- a/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas.snap
+++ b/.forge-snapshots/getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas.snap
@@ -1 +1 @@
-763
\ No newline at end of file
+711
\ No newline at end of file
diff --git a/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas.snap b/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas.snap
index 6a34de5d2..64a0b71f1 100644
--- a/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas.snap
+++ b/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas.snap
@@ -1 +1 @@
-843
\ No newline at end of file
+746
\ No newline at end of file
diff --git a/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas.snap b/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas.snap
index 4c9bbbfa9..93168a9d7 100644
--- a/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas.snap
+++ b/.forge-snapshots/getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas.snap
@@ -1 +1 @@
-468
\ No newline at end of file
+398
\ No newline at end of file
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
index c36e9aa8c..5b94bef39 100644
--- a/.forge-snapshots/poolManager bytecode size.snap	
+++ b/.forge-snapshots/poolManager bytecode size.snap	
@@ -1 +1 @@
-20725
\ No newline at end of file
+20580
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity CA fee.snap b/.forge-snapshots/removeLiquidity CA fee.snap
index f5d7477c9..0a45c582a 100644
--- a/.forge-snapshots/removeLiquidity CA fee.snap	
+++ b/.forge-snapshots/removeLiquidity CA fee.snap	
@@ -1 +1 @@
-182941
\ No newline at end of file
+182927
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
index 5c402f8bf..1489f833b 100644
--- a/.forge-snapshots/removeLiquidity with empty hook.snap	
+++ b/.forge-snapshots/removeLiquidity with empty hook.snap	
@@ -1 +1 @@
-137230
\ No newline at end of file
+137216
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
index 181bba8d9..b6531ae5c 100644
--- a/.forge-snapshots/removeLiquidity with native token.snap	
+++ b/.forge-snapshots/removeLiquidity with native token.snap	
@@ -1 +1 @@
-117016
\ No newline at end of file
+117002
\ No newline at end of file
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
index 7d648d0a3..39622e33d 100644
--- a/.forge-snapshots/simple swap with native.snap	
+++ b/.forge-snapshots/simple swap with native.snap	
@@ -1 +1 @@
-115044
\ No newline at end of file
+114950
\ No newline at end of file
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
index a8ad2a389..79fc0eaf4 100644
--- a/.forge-snapshots/simple swap.snap	
+++ b/.forge-snapshots/simple swap.snap	
@@ -1 +1 @@
-130209
\ No newline at end of file
+130115
\ No newline at end of file
diff --git a/.forge-snapshots/swap CA fee on unspecified.snap b/.forge-snapshots/swap CA fee on unspecified.snap
index 421765a92..b9deaedf0 100644
--- a/.forge-snapshots/swap CA fee on unspecified.snap	
+++ b/.forge-snapshots/swap CA fee on unspecified.snap	
@@ -1 +1 @@
-179850
\ No newline at end of file
+179756
\ No newline at end of file
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
index 5999fc065..7ab695876 100644
--- a/.forge-snapshots/swap against liquidity with native token.snap	
+++ b/.forge-snapshots/swap against liquidity with native token.snap	
@@ -1 +1 @@
-110546
\ No newline at end of file
+110466
\ No newline at end of file
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
index 809d5bfd8..627de811d 100644
--- a/.forge-snapshots/swap against liquidity.snap	
+++ b/.forge-snapshots/swap against liquidity.snap	
@@ -1 +1 @@
-121893
\ No newline at end of file
+121813
\ No newline at end of file
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
index 7d591223b..90ae771cd 100644
--- a/.forge-snapshots/swap burn 6909 for input.snap	
+++ b/.forge-snapshots/swap burn 6909 for input.snap	
@@ -1 +1 @@
-133767
\ No newline at end of file
+133642
\ No newline at end of file
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
index 7328f4391..d7e2c2eb1 100644
--- a/.forge-snapshots/swap burn native 6909 for input.snap	
+++ b/.forge-snapshots/swap burn native 6909 for input.snap	
@@ -1 +1 @@
-123014
\ No newline at end of file
+122930
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
index a3acc7be7..d3eded7e5 100644
--- a/.forge-snapshots/swap mint native output as 6909.snap	
+++ b/.forge-snapshots/swap mint native output as 6909.snap	
@@ -1 +1 @@
-144784
\ No newline at end of file
+144718
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
index 7b88cd961..2630f45e1 100644
--- a/.forge-snapshots/swap mint output as 6909.snap	
+++ b/.forge-snapshots/swap mint output as 6909.snap	
@@ -1 +1 @@
-161442
\ No newline at end of file
+161348
\ No newline at end of file
diff --git a/.forge-snapshots/swap skips hook call if hook is caller.snap b/.forge-snapshots/swap skips hook call if hook is caller.snap
index e242612ef..e6ab785c0 100644
--- a/.forge-snapshots/swap skips hook call if hook is caller.snap	
+++ b/.forge-snapshots/swap skips hook call if hook is caller.snap	
@@ -1 +1 @@
-218072
\ No newline at end of file
+217898
\ No newline at end of file
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
index f80a0a530..be4f8d81b 100644
--- a/.forge-snapshots/swap with dynamic fee.snap	
+++ b/.forge-snapshots/swap with dynamic fee.snap	
@@ -1 +1 @@
-145643
\ No newline at end of file
+145549
\ No newline at end of file
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
index 8997753ab..4d10815ba 100644
--- a/.forge-snapshots/swap with hooks.snap	
+++ b/.forge-snapshots/swap with hooks.snap	
@@ -1 +1 @@
-138950
\ No newline at end of file
+138870
\ No newline at end of file
diff --git a/.forge-snapshots/swap with lp fee and protocol fee.snap b/.forge-snapshots/swap with lp fee and protocol fee.snap
index d58ff8bb7..e5d1fd141 100644
--- a/.forge-snapshots/swap with lp fee and protocol fee.snap	
+++ b/.forge-snapshots/swap with lp fee and protocol fee.snap	
@@ -1 +1 @@
-176884
\ No newline at end of file
+176786
\ No newline at end of file
diff --git a/.forge-snapshots/swap with return dynamic fee.snap b/.forge-snapshots/swap with return dynamic fee.snap
index 8ee0ff853..d5a72f917 100644
--- a/.forge-snapshots/swap with return dynamic fee.snap	
+++ b/.forge-snapshots/swap with return dynamic fee.snap	
@@ -1 +1 @@
-152694
\ No newline at end of file
+152600
\ No newline at end of file
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
index 5673bef94..ef52456a5 100644
--- a/.forge-snapshots/update dynamic fee in before swap.snap	
+++ b/.forge-snapshots/update dynamic fee in before swap.snap	
@@ -1 +1 @@
-155296
\ No newline at end of file
+155202
\ No newline at end of file
diff --git a/src/libraries/SqrtPriceMath.sol b/src/libraries/SqrtPriceMath.sol
index 2b463be08..49ae93fa5 100644
--- a/src/libraries/SqrtPriceMath.sol
+++ b/src/libraries/SqrtPriceMath.sol
@@ -55,7 +55,14 @@ library SqrtPriceMath {
                 uint256 product = amount * sqrtPX96;
                 // if the product overflows, we know the denominator underflows
                 // in addition, we must check that the denominator does not underflow
-                if (product / amount != sqrtPX96 || numerator1 <= product) revert PriceOverflow();
+                // equivalent: if (product / amount != sqrtPX96 || numerator1 <= product) revert PriceOverflow();
+                /// @solidity memory-safe-assembly
+                assembly {
+                    if iszero(and(eq(div(product, amount), sqrtPX96), gt(numerator1, product))) {
+                        mstore(0, 0xf5c787f1) // selector for PriceOverflow()
+                        revert(0x1c, 0x04)
+                    }
+                }
                 uint256 denominator = numerator1 - product;
                 return FullMath.mulDivRoundingUp(numerator1, sqrtPX96, denominator).toUint160();
             }
@@ -94,7 +101,14 @@ library SqrtPriceMath {
                     : FullMath.mulDivRoundingUp(amount, FixedPoint96.Q96, liquidity)
             );
 
-            if (sqrtPX96 <= quotient) revert NotEnoughLiquidity();
+            // equivalent: if (sqrtPX96 <= quotient) revert NotEnoughLiquidity();
+            /// @solidity memory-safe-assembly
+            assembly {
+                if iszero(gt(sqrtPX96, quotient)) {
+                    mstore(0, 0x4323a555) // selector for NotEnoughLiquidity()
+                    revert(0x1c, 0x04)
+                }
+            }
             // always fits 160 bits
             unchecked {
                 return uint160(sqrtPX96 - quotient);
@@ -114,7 +128,14 @@ library SqrtPriceMath {
         pure
         returns (uint160 sqrtQX96)
     {
-        if (sqrtPX96 == 0 || liquidity == 0) revert InvalidPriceOrLiquidity();
+        // equivalent: if (sqrtPX96 == 0 || liquidity == 0) revert InvalidPriceOrLiquidity();
+        /// @solidity memory-safe-assembly
+        assembly {
+            if or(iszero(sqrtPX96), iszero(liquidity)) {
+                mstore(0, 0x4f2461b8) // selector for InvalidPriceOrLiquidity()
+                revert(0x1c, 0x04)
+            }
+        }
 
         // round to make sure that we don't pass the target price
         return zeroForOne
@@ -134,7 +155,14 @@ library SqrtPriceMath {
         pure
         returns (uint160 sqrtQX96)
     {
-        if (sqrtPX96 == 0 || liquidity == 0) revert InvalidPriceOrLiquidity();
+        // equivalent: if (sqrtPX96 == 0 || liquidity == 0) revert InvalidPriceOrLiquidity();
+        /// @solidity memory-safe-assembly
+        assembly {
+            if or(iszero(sqrtPX96), iszero(liquidity)) {
+                mstore(0, 0x4f2461b8) // selector for InvalidPriceOrLiquidity()
+                revert(0x1c, 0x04)
+            }
+        }
 
         // round to make sure that we pass the target price
         return zeroForOne
@@ -158,11 +186,18 @@ library SqrtPriceMath {
         unchecked {
             if (sqrtPriceAX96 > sqrtPriceBX96) (sqrtPriceAX96, sqrtPriceBX96) = (sqrtPriceBX96, sqrtPriceAX96);
 
+            // equivalent: if (sqrtPriceAX96 == 0) revert InvalidPrice();
+            /// @solidity memory-safe-assembly
+            assembly {
+                if iszero(sqrtPriceAX96) {
+                    mstore(0, 0x00bfc921) // selector for InvalidPrice()
+                    revert(0x1c, 0x04)
+                }
+            }
+
             uint256 numerator1 = uint256(liquidity) << FixedPoint96.RESOLUTION;
             uint256 numerator2 = sqrtPriceBX96 - sqrtPriceAX96;
 
-            if (sqrtPriceAX96 == 0) revert InvalidPrice();
-
             return roundUp
                 ? UnsafeMath.divRoundingUp(FullMath.mulDivRoundingUp(numerator1, numerator2, sqrtPriceBX96), sqrtPriceAX96)
                 : FullMath.mulDiv(numerator1, numerator2, sqrtPriceBX96) / sqrtPriceAX96;