diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
index 2a376337fa9..1d23263d2d8 100644
--- a/src/com/android/settings/applications/DefaultEmergencyPreference.java
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -111,11 +111,9 @@ public class DefaultEmergencyPreference extends AppListPreference
                 continue;
             }
 
-            // Get earliest installed app, but prioritize system apps.
-            if (bestMatch == null
-                    || !isSystemApp(bestMatch) && isSystemApp(packageInfo)
-                    || isSystemApp(bestMatch) == isSystemApp(packageInfo)
-                    && bestMatch.firstInstallTime > packageInfo.firstInstallTime) {
+            // Get earliest installed system app.
+            if (isSystemApp(packageInfo) && (bestMatch == null ||
+                    bestMatch.firstInstallTime > packageInfo.firstInstallTime)) {
                 bestMatch = packageInfo;
             }
         }