diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModelV2.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModelV2.kt
index a26c82f839..79697b1267 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModelV2.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModelV2.kt
@@ -14,6 +14,7 @@ import com.navi.base.utils.EMPTY
 import com.navi.base.utils.NaviNetworkConnectivity
 import com.navi.base.utils.ResourceProvider
 import com.navi.base.utils.ZERO_STRING
+import com.navi.base.utils.isNotNull
 import com.navi.base.utils.isNotNullAndNotEmpty
 import com.navi.base.utils.orFalse
 import com.navi.base.utils.orZero
@@ -31,6 +32,7 @@ import com.navi.bbps.common.usecase.RewardNudgeUseCase
 import com.navi.bbps.common.utils.NaviBbpsCommonUtils
 import com.navi.bbps.common.utils.NaviBbpsCommonUtils.evaluateMvelExpression
 import com.navi.bbps.common.utils.NaviBbpsCommonUtils.getValidatedAmountNumber
+import com.navi.bbps.common.utils.NaviBbpsCommonUtils.isCategoryOfTypeAmountChipsRequired
 import com.navi.bbps.common.utils.NaviBbpsDateUtils
 import com.navi.bbps.common.utils.getDisplayableAmount
 import com.navi.bbps.feature.category.BillCategoriesRepository
@@ -165,7 +167,9 @@ constructor(
             }
         }
 
-        updateAmountChipEntity(amount = newAmountValue)
+        if (isCategoryOfTypeAmountChipsRequired(billCategoryEntity?.categoryId.orEmpty())) {
+            updateAmountChipEntity(amount = newAmountValue)
+        }
     }
 
     fun getApplicableDiscount() {
@@ -306,12 +310,14 @@ constructor(
     }
 
     private fun updateAmountChipEntity(amount: String) {
-        updateAmountChipEntityList(
-            amountChipList =
-                amountChipEntityList.value.map { amountChipEntity ->
-                    amountChipEntity.copy(isSelected = amountChipEntity.amount == amount)
-                }
-        )
+        amountChipEntityList.value.isNotNull().let {
+            updateAmountChipEntityList(
+                amountChipList =
+                    amountChipEntityList.value.map { amountChipEntity ->
+                        amountChipEntity.copy(isSelected = amountChipEntity.amount == amount)
+                    }
+            )
+        }
     }
 
     private fun updateAmountChipEntityList(amountChipList: List<AmountChipEntity>) {