diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 10b911b7ebe..4d12043f1b2 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -301,6 +301,9 @@ public class IccLockSettings extends SettingsPreferenceFragment
 
         if (mPinDialog != null) {
             mPinDialog.setEnabled(sir != null);
+            if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                mPinDialog.getDialog().dismiss();
+            }
         }
         if (mPinToggle != null) {
             mPinToggle.setEnabled(sir != null);