diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 8d54dbc..9d062ab 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -3416,7 +3416,8 @@
                 if (apn.canSupportNetworkType(
                         ServiceState.rilRadioTechnologyToNetworkType(radioTech))) {
                     int preferredApnSetId = getPreferredApnSetId();
-                    if (preferredApnSetId == Telephony.Carriers.NO_APN_SET_ID
+                    if (apn.isEmergencyApn()
+                            || preferredApnSetId == Telephony.Carriers.NO_APN_SET_ID
                             || preferredApnSetId == apn.getApnSetId()) {
                         if (VDBG) log("buildWaitingApns: adding apn=" + apn);
                         apnList.add(apn);