diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index ddd45c3..722a861 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -356,7 +356,8 @@
 
         // update WFC setting
         final Context context = getActivity();
-        if (ImsManager.isWfcEnabledByPlatform(context)) {
+        if (ImsManager.isWfcEnabledByPlatform(context) &&
+                ImsManager.isWfcProvisionedOnDevice(context)) {
             getPreferenceScreen().addPreference(mButtonWfc);
 
             mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary(
@@ -473,7 +474,8 @@
                     result.add(KEY_TETHER_SETTINGS);
                 }
 
-                if (!ImsManager.isWfcEnabledByPlatform(context)) {
+                if (!ImsManager.isWfcEnabledByPlatform(context) ||
+                        !ImsManager.isWfcProvisionedOnDevice(context)) {
                     result.add(KEY_WFC_SETTINGS);
                 }
 
diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java
index bde9035..5f140ba 100644
--- a/src/com/android/settings/dashboard/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/SuggestionsChecks.java
@@ -78,7 +78,8 @@
     }
 
     public boolean isWifiCallingUnavailableOrEnabled() {
-        if (!ImsManager.isWfcEnabledByPlatform(mContext)) {
+        if (!ImsManager.isWfcEnabledByPlatform(mContext) ||
+                !ImsManager.isWfcProvisionedOnDevice(mContext)) {
             return true;
         }
         return ImsManager.isWfcEnabledByUser(mContext)
