diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/BillHistoryDetailsViewModel.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/BillHistoryDetailsViewModel.kt
index d92754b1ec..d47acbf643 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/BillHistoryDetailsViewModel.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/BillHistoryDetailsViewModel.kt
@@ -279,7 +279,7 @@ constructor(
             billNumber = billNumber ?: "",
             refundStatus = refundStatus,
             refundTransactionId = refundTransactionId.orEmpty(),
-            orderReferenceId = orderReferenceId,
+            orderReferenceId = orderReferenceId.orEmpty(),
             transactionDetails =
                 TransactionDetailsEntity(
                     paymentTransactionId = transactionDetails.paymentTransactionId,
diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/model/network/BillTransactionHistoryResponse.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/model/network/BillTransactionHistoryResponse.kt
index 98f0fc79ee..6868e82419 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/model/network/BillTransactionHistoryResponse.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/billhistorydetail/model/network/BillTransactionHistoryResponse.kt
@@ -27,7 +27,7 @@ data class TransactionItemResponse(
     @SerializedName("planName") val planName: String?,
     @SerializedName("refundStatus") val refundStatus: String?,
     @SerializedName("refundTransactionId") val refundTransactionId: String?,
-    @SerializedName("orderReferenceId") val orderReferenceId: String,
+    @SerializedName("orderReferenceId") val orderReferenceId: String?,
     @SerializedName("transactionDetails") val transactionDetails: TransactionDetailsResponse
 )
 
diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModel.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModel.kt
index 8274fef93c..504d57d6a4 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModel.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/PayBillViewModel.kt
@@ -730,7 +730,7 @@ constructor(
                 paymentResponseMetadata.optString("uniqueTransactionReference") ?: ""
             val upiRequestId = paymentResponseMetadata.optString("upiRequestId") ?: ""
             val debitedFrom = paymentResponseMetadata.optString("debitedFrom") ?: ""
-            val orderReferenceId = paymentResponseMetadata.optString("tstoreOrderReferenceId")
+            val orderReferenceId = paymentResponseMetadata.optString("tstoreOrderReferenceId") ?: ""
             var planItemEntity: PlanItemEntity? = null
             var billerLogoUrl = ""
             var billerName = ""