diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 7c828f9..c1e1a7f 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -50,6 +50,7 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
@@ -1526,10 +1527,11 @@
         mPhoneAccountSettingsPreference = findPreference(PHONE_ACCOUNT_SETTINGS_KEY);
 
         TelecomManager telecomManager = TelecomManager.from(this);
+        TelephonyManager telephonyManager =
+                (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
-        if (telecomManager.getAllPhoneAccountsCount() <= 1
-                && telecomManager.getSimCallManagers().isEmpty()
-                && !SipUtil.isVoipSupported(this)) {
+        if ((telecomManager.getSimCallManagers().isEmpty() && !SipUtil.isVoipSupported(this))
+                || telephonyManager.getPhoneCount() > 1) {
             getPreferenceScreen().removePreference(mPhoneAccountSettingsPreference);
         }
     }
