diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
index e7ff206f3..972d3f07e 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
@@ -1272,7 +1272,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
     }
 
     protected double calculateInterestForDays(int daysInPeriodApplicableForInterest, BigDecimal interest, int days) {
-        if (interest.doubleValue() == 0) { return 0; }
+        if (interest.doubleValue() == 0 || days == 0) { return 0; }
         return ((interest.doubleValue()) / daysInPeriodApplicableForInterest) * days;
     }