diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java
index b7aaf1271..a8fa9287f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java
@@ -1105,6 +1105,12 @@ public final class LoanApplicationTerms {
             }
         }
         Integer periodsRemaining = totalNumberOfRepaymentPeriods - periodsElapsed - principalFeePeriods;
+        /**
+         * if grace period available then need to be subtracted
+         */
+        if(this.interestChargingGrace != null){
+        	periodsRemaining = periodsRemaining - this.interestChargingGrace;
+        }
         return periodsRemaining;
     }