diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts
index bac634ca..4cd07f44 100644
--- a/src/constants/tokens.ts
+++ b/src/constants/tokens.ts
@@ -27,11 +27,11 @@ export function nativeOnChain(chainId: ChainId): NativeCurrency | Token {
 }
 
 export const POOL_CLASS_HASH = {
-  [ChainId.MAINNET]: '0x426a4fb3b82644a07dbab45099214976f880d7aba0d399c88f59297a3cf1aa6',
+  [ChainId.MAINNET]: '0x2cd3c16a0112b22ded4903707f268125fcf46fd7733761e62c13fc0157afd8d',
   [ChainId.GOERLI]: '0x2cd3c16a0112b22ded4903707f268125fcf46fd7733761e62c13fc0157afd8d',
 }
 export const FACTORY_ADDRESS = {
-  [ChainId.MAINNET]: '0x07bf9f8fc91a0c0814a254c8e77218620801e077d090cb627fa9a25674ce2970',
+  [ChainId.MAINNET]: '0x01aa950c9b974294787de8df8880ecf668840a6ab8fa8290bf2952212b375148',
   [ChainId.GOERLI]: '0x050d3df81b920d3e608c4f7aeb67945a830413f618a1cf486bdcce66a395109c',
 }
 
@@ -41,11 +41,11 @@ export const FACTORY_ADDRESS_CLASS_HASH: { [chainId in ChainId]: string } = {
 }
 
 export const NONFUNGIBLE_POOL_MANAGER_ADDRESS: { [chainId in ChainId]: string } = {
-  [ChainId.MAINNET]: '0x045cb97368b10d6a5345bf7cfde71bc99360687451519a0e2a3508b32f50ece0',
+  [ChainId.MAINNET]: '0x0469b656239972a2501f2f1cd71bf4e844d64b7cae6773aa84c702327c476e5b',
   [ChainId.GOERLI]: '0x024fd9721eea36cf8cebc226fd9414057bbf895b47739822f849f622029f9399',
 }
 export const SWAP_ROUTER_ADDRESS_V2 = {
-  [ChainId.MAINNET]: '0x039c6dac17d1968f5bbbf65b4180fc3cb83cfea08147cbb1950e053f647d21f8',
+  [ChainId.MAINNET]: '0x0359550b990167afd6635fa574f3bdadd83cb51850e1d00061fe693158c23f80',
   [ChainId.GOERLI]: '0x03c8e56d7f6afccb775160f1ae3b69e3db31b443e544e56bd845d8b3b3a87a21',
 }
 
diff --git a/src/state/mint/v3/hooks.tsx b/src/state/mint/v3/hooks.tsx
index bd8205ff..0c4fa64b 100644
--- a/src/state/mint/v3/hooks.tsx
+++ b/src/state/mint/v3/hooks.tsx
@@ -250,7 +250,7 @@ export function useV3DerivedMintInfo(
       [Bound.LOWER]:
         typeof existingPosition?.tickLower === 'number'
           ? existingPosition.tickLower
-          : (invertPrice && typeof rightRangeTypedValue === 'boolean') ||
+          : (invertPrice && (typeof rightRangeTypedValue === 'boolean' || rightRangeTypedValue === '∞')) ||
             (!invertPrice && typeof leftRangeTypedValue === 'boolean')
           ? tickSpaceLimits[Bound.LOWER]
           : invertPrice