diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
index de7e7801ac2..b456e531d58 100644
--- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
@@ -86,7 +86,11 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo
     private boolean isCellBroadcastAppLinkEnabled() {
         // Enable link to CMAS app settings depending on the value in config.xml.
         boolean enabled = mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_cellBroadcastAppLinks);
+            com.android.internal.R.bool.config_cellBroadcastAppLinks) &&
+            // For data-only tablet devices which need to not forwarding any WEA-alert and hide from
+            // settings menu.
+            !mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_disable_all_cb_messages);
         if (enabled) {
             try {
                 String packageName = CellBroadcastUtils