diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt
index 18754d3592..906b4af7a7 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt
@@ -471,8 +471,10 @@ constructor(
                 .filter {
                     it.orderStatusOfView == OrderStatusOfView.Debit &&
                         it.paymentStatus != OrderPaymentStatus.REFUNDED &&
-                        !it.isUpiLiteTopUpOrClosureTransaction
-                    // currently only debit sum is considered & lite topup/autotopup is excluded to
+                        !it.isUpiLiteTopUpOrClosureTransaction &&
+                        !it.isOrderOfSelfTransferType
+                    // currently only debit sum is considered excluding self transfer & lite
+                    // topup/autotopup is excluded to
                     // avoid double counting
                 }
                 .groupBy { it.monthTag }
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/utils/error/OrderErrorMappingManager.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/utils/error/OrderErrorMappingManager.kt
index 4d0f91eb18..bf7e4e2a83 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/utils/error/OrderErrorMappingManager.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/utils/error/OrderErrorMappingManager.kt
@@ -83,22 +83,7 @@ constructor(
     }
 
     suspend fun getErrorEntityByCode(errorCode: String): OrderErrorEntity {
-        if (errorCode.isBlank()) return getDefaultError()
-
-        return orderRepository.getOrderErrorEntity(errorCode)
-            ?: run {
-                val lastSyncedTimestamp =
-                    syncRepository
-                        .get(NAVI_PAY_SYNC_TABLE_ORDER_ERROR_MAPPING_KEY)
-                        ?.lastSyncedTimestamp
-                        ?.toLongOrNull() ?: 0L
-
-                fetchAndStoreErrorMappings(
-                    screenName = "OrderErrorDetailsManager_getErrorEntityByCode",
-                    lastSyncedTimestamp = lastSyncedTimestamp,
-                )
-                orderRepository.getOrderErrorEntity(errorCode) ?: getDefaultError()
-            }
+        return orderRepository.getOrderErrorEntity(errorCode) ?: getDefaultError()
     }
 
     private fun getDefaultError() =