diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
index 381c3785..5c3321cf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
@@ -282,9 +282,9 @@ class RecentCallsAdapter(
                 setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.8f)
             }
 
-            item_recents_sim_image.beVisibleIf(areMultipleSIMsAvailable)
-            item_recents_sim_id.beVisibleIf(areMultipleSIMsAvailable)
-            if (areMultipleSIMsAvailable) {
+            item_recents_sim_image.beVisibleIf(areMultipleSIMsAvailable && call.simID != -1)
+            item_recents_sim_id.beVisibleIf(areMultipleSIMsAvailable && call.simID != -1)
+            if (areMultipleSIMsAvailable && call.simID != -1) {
                 item_recents_sim_image.applyColorFilter(textColor)
                 item_recents_sim_id.setTextColor(textColor.getContrastColor())
                 item_recents_sim_id.text = call.simID.toString()
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt
index b3dcd84a..cde7dcb0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt
@@ -53,12 +53,12 @@ class RecentsHelper(private val context: Context) {
             Calls.DATE,
             Calls.DURATION,
             Calls.TYPE,
-            "phone_account_address"
+            Calls.PHONE_ACCOUNT_ID
         )
 
-        val numberToSimIDMap = HashMap<String, Int>()
+        val accountIdToSimIDMap = HashMap<String, Int>()
         context.getAvailableSIMCardLabels().forEach {
-            numberToSimIDMap[it.phoneNumber] = it.id
+            accountIdToSimIDMap[it.handle.id] = it.id
         }
 
         val cursor = if (isRPlus()) {
@@ -138,8 +138,8 @@ class RecentsHelper(private val context: Context) {
 
                 val duration = cursor.getIntValue(Calls.DURATION)
                 val type = cursor.getIntValue(Calls.TYPE)
-                val accountAddress = cursor.getStringValue("phone_account_address")
-                val simID = numberToSimIDMap[accountAddress] ?: 1
+                val accountId = cursor.getStringValue(Calls.PHONE_ACCOUNT_ID)
+                val simID = accountIdToSimIDMap[accountId] ?: -1
                 val neighbourIDs = ArrayList<Int>()
                 var specificNumber = ""
                 var specificType = ""