diff --git a/src/com/android/messaging/datamodel/DataModelImpl.java b/src/com/android/messaging/datamodel/DataModelImpl.java
index b213162..106bfba 100644
--- a/src/com/android/messaging/datamodel/DataModelImpl.java
+++ b/src/com/android/messaging/datamodel/DataModelImpl.java
@@ -250,8 +250,11 @@
                 if (subId <= ParticipantData.DEFAULT_SELF_SUB_ID) {
                     subId = PhoneUtils.getDefault().getDefaultSmsSubscriptionId();
                 }
-                sConnectivityUtilInstanceCacheLMR1.computeIfAbsent(
-                        subId, key -> new ConnectivityUtil(mContext, key));
+
+                if (!sConnectivityUtilInstanceCacheLMR1.containsKey(subId)) {
+                    sConnectivityUtilInstanceCacheLMR1.put(
+                            subId, new ConnectivityUtil(mContext, subId));
+                }
             }
         });
     }