diff --git a/src/lib/src/trade.ts b/src/lib/src/trade.ts
index 74b92ded2..a953a9ed0 100644
--- a/src/lib/src/trade.ts
+++ b/src/lib/src/trade.ts
@@ -143,7 +143,13 @@ export class Trade<
     const poolAddressSet = new Set<string>();
     for (const { route } of routes) {
       for (const pool of route.pools) {
-        poolAddressSet.add(Pool.getAddress(pool.token0, pool.token1, pool.fee));
+        poolAddressSet.add(
+          Pool.getAddress(
+            pool.token0,
+            pool.token1,
+            pool.isUni ? pool.fee : undefined,
+          ),
+        );
       }
     }
 
diff --git a/src/pages/AnalyticsPairDetails/AnalyticsPairLiquidityChartV3.tsx b/src/pages/AnalyticsPairDetails/AnalyticsPairLiquidityChartV3.tsx
index 1c781d2fe..b9001fb6f 100644
--- a/src/pages/AnalyticsPairDetails/AnalyticsPairLiquidityChartV3.tsx
+++ b/src/pages/AnalyticsPairDetails/AnalyticsPairLiquidityChartV3.tsx
@@ -118,7 +118,7 @@ const AnalyticsPairLiquidityChartV3: React.FC<{
                   t.liquidityActive,
                   t.tickIdx,
                   mockTicks,
-                  false,
+                  isUni,
                 )
               : undefined;
           const nextSqrtX96 = liquidityChartData.ticksProcessed[i - 1]
diff --git a/src/pages/PoolsPage/v3/MigrateV2DetailsPage/index.tsx b/src/pages/PoolsPage/v3/MigrateV2DetailsPage/index.tsx
index 9614afc6b..600905210 100644
--- a/src/pages/PoolsPage/v3/MigrateV2DetailsPage/index.tsx
+++ b/src/pages/PoolsPage/v3/MigrateV2DetailsPage/index.tsx
@@ -326,7 +326,7 @@ export default function MigrateV2DetailsPage() {
           new Pool(
             token0,
             token1,
-            FeeAmount.LOW,
+            undefined,
             sqrtPrice,
             0,
             tick,
diff --git a/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectRange/index.tsx b/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectRange/index.tsx
index 64099b572..cb5fa2fc1 100644
--- a/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectRange/index.tsx
+++ b/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectRange/index.tsx
@@ -582,6 +582,7 @@ export function SelectRange({
           onRightRangeInput={onRightRangeInput}
           interactive={false}
           priceFormat={priceFormat}
+          feeAmount={mintInfo.feeAmount}
         />
       </Box>
     </Box>
diff --git a/src/v3lib/entities/trade.ts b/src/v3lib/entities/trade.ts
index a7b1fee85..d74070498 100644
--- a/src/v3lib/entities/trade.ts
+++ b/src/v3lib/entities/trade.ts
@@ -144,7 +144,13 @@ export class Trade<
     const poolAddressSet = new Set<string>();
     for (const { route } of routes) {
       for (const pool of route.pools) {
-        poolAddressSet.add(Pool.getAddress(pool.token0, pool.token1, pool.fee));
+        poolAddressSet.add(
+          Pool.getAddress(
+            pool.token0,
+            pool.token1,
+            pool.isUni ? pool.fee : undefined,
+          ),
+        );
       }
     }