diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index f993b8a..450ffff 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -212,9 +212,8 @@
                 mSubscriptionManager.getDefaultSmsSubId());
         simPref.setTitle(R.string.sms_messages_title);
         if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList);
-        if (mSubInfoList != null && mSubInfoList.size() == 1) {
-            simPref.setSummary(mSubInfoList.get(0).getDisplayName());
-        } else if (sir != null) {
+
+        if (sir != null) {
             simPref.setSummary(sir.getDisplayName());
         } else if (sir == null) {
             simPref.setSummary(R.string.sim_selection_required_pref);
@@ -229,9 +228,7 @@
         simPref.setTitle(R.string.cellular_data_title);
         if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);
 
-        if (mSubInfoList != null && mSubInfoList.size() == 1) {
-            simPref.setSummary(mSubInfoList.get(0).getDisplayName());
-        } else if (sir != null) {
+        if (sir != null) {
             simPref.setSummary(sir.getDisplayName());
         } else if (sir == null) {
             simPref.setSummary(R.string.sim_selection_required_pref);
