diff --git a/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/configuration/FineractProgressiveLoanBeanConfiguration.java b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/configuration/FineractProgressiveLoanBeanConfiguration.java
new file mode 100644
index 000000000..f4e58567f
--- /dev/null
+++ b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/configuration/FineractProgressiveLoanBeanConfiguration.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.configuration;
+
+import org.apache.fineract.portfolio.delinquency.service.ProgressivePossibleNextRepaymentCalculationServiceImpl;
+import org.apache.fineract.portfolio.loanaccount.domain.transactionprocessor.impl.AdvancedPaymentScheduleTransactionProcessor;
+import org.apache.fineract.portfolio.loanaccount.service.InterestScheduleModelRepositoryWrapper;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FineractProgressiveLoanBeanConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean(ProgressivePossibleNextRepaymentCalculationServiceImpl.class)
+    public ProgressivePossibleNextRepaymentCalculationServiceImpl progressivePossibleNextRepaymentCalculationService(
+            InterestScheduleModelRepositoryWrapper interestScheduleModelRepository,
+            AdvancedPaymentScheduleTransactionProcessor advancedPaymentScheduleTransactionProcessor) {
+        return new ProgressivePossibleNextRepaymentCalculationServiceImpl(interestScheduleModelRepository,
+                advancedPaymentScheduleTransactionProcessor);
+    }
+}
diff --git a/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/ProgressivePossibleNextRepaymentCalculationServiceImpl.java b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/ProgressivePossibleNextRepaymentCalculationServiceImpl.java
index 75ba38dca..577f782f8 100644
--- a/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/ProgressivePossibleNextRepaymentCalculationServiceImpl.java
+++ b/fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/ProgressivePossibleNextRepaymentCalculationServiceImpl.java
@@ -35,10 +35,8 @@ import org.apache.fineract.portfolio.loanaccount.domain.transactionprocessor.imp
 import org.apache.fineract.portfolio.loanaccount.service.InterestScheduleModelRepositoryWrapper;
 import org.apache.fineract.portfolio.loanproduct.calc.data.ProgressiveLoanInterestScheduleModel;
 import org.apache.fineract.portfolio.loanproduct.calc.data.RepaymentPeriod;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-@Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class ProgressivePossibleNextRepaymentCalculationServiceImpl extends AbstractPossibleNextRepaymentCalculationService {