diff --git a/src/com/android/settings/sim/SimBootReceiver.java b/src/com/android/settings/sim/SimBootReceiver.java
index 3b3489e..4cd1438 100644
--- a/src/com/android/settings/sim/SimBootReceiver.java
+++ b/src/com/android/settings/sim/SimBootReceiver.java
@@ -44,6 +44,7 @@
     private static final int NOTIFICATION_ID = 1;
     private static final String SHARED_PREFERENCES_NAME = "sim_state";
     private static final String SLOT_PREFIX = "sim_slot_";
+    private static final int INVALID_SLOT = -2; // Used when upgrading from K to LMR1
 
     private SharedPreferences mSharedPreferences = null;
     private TelephonyManager mTelephonyManager;
@@ -91,7 +92,9 @@
             if (sir != null) {
                 numSIMsDetected++;
                 final int currentSubId = sir.getSubscriptionId();
-                if (lastSubId != currentSubId) {
+                if (lastSubId == INVALID_SLOT) {
+                    setLastSubId(key, currentSubId);
+                } else if (lastSubId != currentSubId) {
                     createNotification(mContext);
                     setLastSubId(key, currentSubId);
                     notificationSent = true;
@@ -118,7 +121,7 @@
     }
 
     private int getLastSubId(String strSlotId) {
-        return mSharedPreferences.getInt(strSlotId, SLOT_EMPTY);
+        return mSharedPreferences.getInt(strSlotId, INVALID_SLOT);
     }
 
     private void setLastSubId(String strSlotId, int value) {