diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 7ac05ab..f2d2adb 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1540,11 +1540,24 @@
         SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE_APN,
                 Context.MODE_PRIVATE);
         long apnId = sp.getLong(COLUMN_APN_ID + subId, INVALID_APN_ID);
-        if (apnId == INVALID_APN_ID && checkApnSp) {
-            apnId = getDefaultPreferredApnId();
-            if (apnId > INVALID_APN_ID) {
-                setPreferredApnId(apnId, subId);
-                deletePreferredApn(subId);
+        if (apnId == INVALID_APN_ID) {
+            if (checkApnSp) {
+                apnId = getPreferredApnIdFromApn(subId);
+                if (apnId == INVALID_APN_ID) {
+                    apnId = getDefaultPreferredApnId();
+
+                    if (apnId != INVALID_APN_ID) {
+                        setPreferredApnId(apnId, subId);
+                    }
+                } else {
+                    setPreferredApnId(apnId, subId);
+                    deletePreferredApn(subId);
+                }
+            } else {
+                apnId = getDefaultPreferredApnId();
+                if (apnId != INVALID_APN_ID) {
+                    setPreferredApnId(apnId, subId);
+                }
             }
         }
         return apnId;