diff --git a/src/constants/constants.js b/src/constants/constants.js
index ddb44ab5bc..24b9539962 100644
--- a/src/constants/constants.js
+++ b/src/constants/constants.js
@@ -8,7 +8,7 @@ export const FALLBACK_PROVIDER_QUORUM = 1;
 
 export const RPC_PROVIDER_STALL_TIMEOUT = 60 * 1000;
 
-export const UINT256_MAX_BN = BigNumber.from(2).pow(256).sub(1);
+export const UINT256_MAX_BN = ethers.constants.MaxUint256;
 
 export const UINT128_MAX_BN = BigNumber.from(2).pow(128).sub(1);
 
@@ -18,7 +18,7 @@ export const UINT40_MAX_BN = BigNumber.from(2).pow(40).sub(1);
 
 export const UINT32_MAX_BN = BigNumber.from(2).pow(32).sub(1);
 
-export const HASH_RING_SIZE = BigNumber.from(2).pow(256);
+export const HASH_RING_SIZE = ethers.constants.MaxUint256;
 
 export const STAKE_UINT256_MULTIPLIER_BN = UINT256_MAX_BN.div(500000000);
 
diff --git a/src/service/proximity-scoring-service.js b/src/service/proximity-scoring-service.js
index ade26896ec..4e06f6197a 100644
--- a/src/service/proximity-scoring-service.js
+++ b/src/service/proximity-scoring-service.js
@@ -143,10 +143,9 @@ class ProximityScoringService {
         const idealMaxDistanceInNeighborhood = HASH_RING_SIZE.div(nodesNumber).mul(
             Math.ceil(r2 / 2),
         );
-        const divisor =
-            maxNeighborhoodDistance <= idealMaxDistanceInNeighborhood
-                ? maxNeighborhoodDistance
-                : idealMaxDistanceInNeighborhood;
+        const divisor = maxNeighborhoodDistance.lte(idealMaxDistanceInNeighborhood)
+            ? maxNeighborhoodDistance
+            : idealMaxDistanceInNeighborhood;
 
         const maxMultiplier = UINT256_MAX_BN.div(distance);