diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/utils/MyBillEntityToBillDetailsResponseMapper.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/utils/MyBillEntityToBillDetailsResponseMapper.kt
index 6c22fbf5ec..584cf4dac9 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/utils/MyBillEntityToBillDetailsResponseMapper.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/utils/MyBillEntityToBillDetailsResponseMapper.kt
@@ -9,6 +9,7 @@ package com.navi.bbps.common.utils
 
 import com.navi.bbps.feature.customerinput.model.network.BillDetailsResponse
 import com.navi.bbps.feature.mybills.model.view.MyBillEntity
+import com.navi.naviwidgets.utils.ZERO
 import javax.inject.Inject
 
 class MyBillEntityToBillDetailsResponseMapper
@@ -26,7 +27,7 @@ constructor(
             billId = myBillEntity.billId,
             billerId = billerDetails.billerId,
             referenceId = myBillEntity.unpaidBillDetails?.referenceId.orEmpty(),
-            amount = myBillEntity.unpaidBillDetails?.amount,
+            amount = myBillEntity.unpaidBillDetails?.amount.orEmpty().ifBlank { ZERO },
             billDate = myBillEntity.unpaidBillDetails?.billDate,
             dueDate = myBillEntity.unpaidBillDetails?.dueDate,
             billNumber = myBillEntity.unpaidBillDetails?.billNumber,
diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/MyBillsResponseToEntityMapper.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/MyBillsResponseToEntityMapper.kt
index c59bb729aa..09bf15d902 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/MyBillsResponseToEntityMapper.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/MyBillsResponseToEntityMapper.kt
@@ -18,6 +18,7 @@ import com.navi.bbps.feature.mybills.model.network.SavedBillItem
 import com.navi.bbps.feature.mybills.model.view.MyBillEntity
 import com.navi.bbps.feature.mybills.model.view.UnpaidBillDetails
 import com.navi.bbps.feature.paybill.model.network.PaymentAmountExactness
+import com.navi.naviwidgets.utils.ZERO
 import javax.inject.Inject
 
 class MyBillsResponseToEntityMapper
@@ -70,7 +71,7 @@ constructor(
                 unpaidBillDetails =
                     UnpaidBillDetails(
                         referenceId = it.unpaidBillDetails?.referenceId.orEmpty(),
-                        amount = it.unpaidBillDetails?.amount.orEmpty(),
+                        amount = it.unpaidBillDetails?.amount.orEmpty().ifBlank { ZERO },
                         billDate = it.unpaidBillDetails?.billDate.orEmpty(),
                         dueDate = it.unpaidBillDetails?.dueDate.orEmpty(),
                         billNumber = it.unpaidBillDetails?.billNumber.orEmpty(),
diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/MyBillsViewModel.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/MyBillsViewModel.kt
index 502d8bf825..2ffcd5285f 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/MyBillsViewModel.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/mybills/MyBillsViewModel.kt
@@ -64,7 +64,7 @@ import com.navi.bbps.feature.prepaidrecharge.model.view.PlanItemEntity
 import com.navi.bbps.isRedirectToCustomerInputRequired
 import com.navi.common.di.CoroutineDispatcherProvider
 import com.navi.common.network.models.isSuccessWithData
-import com.navi.common.utils.Constants.ZERO
+import com.navi.naviwidgets.utils.ZERO
 import com.navi.rr.common.models.OfferRequest
 import com.navi.rr.utils.constants.OffersConstants.OFFERS_OS_TYPE_ANDROID
 import com.navi.rr.utils.constants.OffersConstants.OS_TYPE
diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreenV2.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreenV2.kt
index e2fdba2874..c04b16dc98 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreenV2.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreenV2.kt
@@ -1264,7 +1264,7 @@ fun onBillHistoryClicked(
                         unpaidBillDetails =
                             UnpaidBillDetails(
                                 referenceId = "",
-                                amount = "",
+                                amount = ZERO,
                                 billDate = "",
                                 dueDate = "",
                                 billNumber = "",
@@ -1285,7 +1285,7 @@ fun onBillHistoryClicked(
                         unpaidBillDetails =
                             UnpaidBillDetails(
                                 referenceId = "",
-                                amount = "",
+                                amount = ZERO,
                                 billDate = "",
                                 dueDate = "",
                                 billNumber = "",