diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductInterestRecalculationDetails.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductInterestRecalculationDetails.java
index 97de3bd5c..dd8817c46 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductInterestRecalculationDetails.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductInterestRecalculationDetails.java
@@ -78,12 +78,13 @@ public class LoanProductInterestRecalculationDetails extends AbstractPersistable
         RecalculationFrequencyType frequencyType = RecalculationFrequencyType.fromInt(recurrenceFrequency);
         Date recurrenceOnDate = null;
         if (recurrenceOnLocalDate != null) {
-            if (frequencyType.isSameAsRepayment()) {
-                recurrenceInterval = 0;
-            } else {
+            if (!frequencyType.isSameAsRepayment()) {
                 recurrenceOnDate = recurrenceOnLocalDate.toDate();
             }
         }
+        if (frequencyType.isSameAsRepayment()) {
+            recurrenceInterval = 0;
+        }
 
         return new LoanProductInterestRecalculationDetails(interestRecalculationCompoundingMethod, loanRescheduleStrategyMethod,
                 recurrenceFrequency, recurrenceInterval, recurrenceOnDate);