diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/CalculateLoanScheduleQueryFromApiJsonHelper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/CalculateLoanScheduleQueryFromApiJsonHelper.java
index d33ea1df1..3a8fe3800 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/CalculateLoanScheduleQueryFromApiJsonHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/CalculateLoanScheduleQueryFromApiJsonHelper.java
@@ -148,6 +148,16 @@ public final class CalculateLoanScheduleQueryFromApiJsonHelper {
                                     "The parameter loanTermFrequency is less than the suggest loan term as indicated by numberOfRepayments and repaymentEvery.",
                                     "loanTermFrequency", loanTermFrequency, numberOfRepayments, repaymentEvery);
                     dataValidationErrors.add(error);
+                } else {
+                        if (loanTermFrequency.intValue() > suggestsedLoanTerm) {
+                            final ApiParameterError error = ApiParameterError
+                                    .parameterError(
+                                            "validation.msg.loan.loanTermFrequency.greater.than.repayment.structure.suggests",
+                                            "The parameter loanTermFrequency is greater than the suggested loan term as indicated by numberOfRepayments and repaymentEvery.",
+                                            "loanTermFrequency", loanTermFrequency, numberOfRepayments, repaymentEvery);
+                            dataValidationErrors.add(error);
+                        }
+                    
                 }
             }
         }