diff --git a/src/waiting-time/utils/calculate-frame-by-validator-balances.ts b/src/waiting-time/utils/calculate-frame-by-validator-balances.ts
index 890d108..76bfad0 100644
--- a/src/waiting-time/utils/calculate-frame-by-validator-balances.ts
+++ b/src/waiting-time/utils/calculate-frame-by-validator-balances.ts
@@ -43,5 +43,8 @@ export const calculateFrameByValidatorBalances = (args: calculateFrameByValidato
   const sweepingMean = calculateSweepingMean(totalValidators).toNumber();
   const framesOfSweepingMean = Math.ceil(sweepingMean / epochPerFrame);
 
-  return result.add(framesOfSweepingMean).toNumber();
+  const resultFrame = result.add(framesOfSweepingMean).toNumber();
+
+  // If withdrawable_epoch is less than current frame, should return next frame
+  return resultFrame < currentFrame ? currentFrame + 1 : resultFrame;
 };