diff --git a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanFormScreenFragment.kt b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanFormScreenFragment.kt
index 40054abe7f..90ae08d2f2 100644
--- a/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanFormScreenFragment.kt
+++ b/navi_hl_dynamic/src/main/java/com/navi/hl/steps/fragment/HomeLoanFormScreenFragment.kt
@@ -297,7 +297,6 @@ class HomeLoanFormScreenFragment :
         }
 
         viewModel.formPatchResponse.observeNullable(viewLifecycleOwner) { response ->
-            hideLoader()
             response?.toastMessage?.let {
                 context?.let { context ->
                     val toastView = getToastView(it, context)
@@ -309,7 +308,6 @@ class HomeLoanFormScreenFragment :
             }
             val requestId = response?.requestId
             if (requestId != null) {
-                showLoader()
                 deInitializeAsyncListeners(firebaseDataHelper, apiPollScheduler, false)
                 firebaseInit(requestId, response.notificationPath.orEmpty(), PAN_DETAILS)
                 apiPollInit(requestId, response.requestConfig)
@@ -317,12 +315,14 @@ class HomeLoanFormScreenFragment :
                 if (isPropertyDetailScreen()) {
                     initiateUserDataUploadProcess(response?.cta)
                 } else {
+                    hideLoader()
                     moveToNextScreen(response?.cta)
                 }
             } else {
                 if (isPropertyDetailScreen()) {
                     initiateUserDataUploadProcess(viewModel.formGetResponse.value?.footer?.nextCta)
                 } else {
+                    hideLoader()
                     checkCtaAndMoveToNextScreen()
                 }
             }
@@ -377,12 +377,12 @@ class HomeLoanFormScreenFragment :
     private fun initiateUserDataUploadProcess(cta: CtaData?) {
         ctaAfterUserDataUpload = cta
         if (permissionsManager.hasPermissions(checkPermissionArray)) {
-            showLoader()
             sendUserData()
             context?.let { context ->
                 sendDeviceData(getScreenRefreshRate(context, this.activity?.windowManager))
             }
         } else {
+            hideLoader()
             moveToNextScreen(cta)
         }
     }