diff --git a/src/com/android/settings/users/GuestTelephonyPreferenceController.java b/src/com/android/settings/users/GuestTelephonyPreferenceController.java
index 83e4bfc5310..4fbd4493bb7 100644
--- a/src/com/android/settings/users/GuestTelephonyPreferenceController.java
+++ b/src/com/android/settings/users/GuestTelephonyPreferenceController.java
@@ -75,6 +75,7 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll
         super.updateState(preference);
         mUserCaps.updateAddUserCapabilities(mContext);
         preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled
-                && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY));
+                && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+                && !UserManager.isHeadlessSystemUserMode());
     }
 }
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index a030d865a8b..1f0d824d087 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -376,7 +376,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
             if (!Utils.isVoiceCapable(context)) { // no telephony
                 removePreference(KEY_ENABLE_TELEPHONY);
             }
-            if (mUserInfo.isMain()) {
+            if (mUserInfo.isMain() || UserManager.isHeadlessSystemUserMode()) {
                 removePreference(KEY_ENABLE_TELEPHONY);
             }
             if (mUserInfo.isRestricted()) {