diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 89a6836..9fddd3d 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1729,17 +1729,24 @@
                         quietMode.put(serialNo, mUserManager.isQuietModeEnabled(user));
 
                         boolean userUnlocked = mUserManager.isUserUnlocked(user);
-                        unlockedUsers.put(serialNo, userUnlocked);
 
                         // We can only query for shortcuts when the user is unlocked.
                         if (userUnlocked) {
-                            List<ShortcutInfoCompat> pinnedShortcuts = mDeepShortcutManager
-                                    .queryForPinnedShortcuts(null, user);
-                            for (ShortcutInfoCompat shortcut : pinnedShortcuts) {
-                                shortcutKeyToPinnedShortcuts.put(ShortcutKey.fromInfo(shortcut),
-                                        shortcut);
+                            List<ShortcutInfoCompat> pinnedShortcuts =
+                                    mDeepShortcutManager.queryForPinnedShortcuts(null, user);
+                            if (mDeepShortcutManager.wasLastCallSuccess()) {
+                                for (ShortcutInfoCompat shortcut : pinnedShortcuts) {
+                                    shortcutKeyToPinnedShortcuts.put(ShortcutKey.fromInfo(shortcut),
+                                            shortcut);
+                                }
+                            } else {
+                                // Shortcut manager can fail due to some race condition when the
+                                // lock state changes too frequently. For the purpose of the loading
+                                // shortcuts, consider the user is still locked.
+                                userUnlocked = false;
                             }
                         }
+                        unlockedUsers.put(serialNo, userUnlocked);
                     }
 
                     ShortcutInfo info;
@@ -3383,9 +3390,17 @@
 
             HashMap<ShortcutKey, ShortcutInfoCompat> pinnedShortcuts = new HashMap<>();
             if (isUserUnlocked) {
-                for (ShortcutInfoCompat shortcut :
-                        mDeepShortcutManager.queryForPinnedShortcuts(null, mUser)) {
-                    pinnedShortcuts.put(ShortcutKey.fromInfo(shortcut), shortcut);
+                List<ShortcutInfoCompat> shortcuts =
+                        mDeepShortcutManager.queryForPinnedShortcuts(null, mUser);
+                if (mDeepShortcutManager.wasLastCallSuccess()) {
+                    for (ShortcutInfoCompat shortcut : shortcuts) {
+                        pinnedShortcuts.put(ShortcutKey.fromInfo(shortcut), shortcut);
+                    }
+                } else {
+                    // Shortcut manager can fail due to some race condition when the lock state
+                    // changes too frequently. For the purpose of the update,
+                    // consider it as still locked.
+                    isUserUnlocked = false;
                 }
             }
 
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
index 36bb2b5..05ab843 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
@@ -105,7 +105,7 @@
             try {
                 mLauncherApps.pinShortcuts(packageName, pinnedIds, user.getUser());
                 mWasLastCallSuccess = true;
-            } catch (SecurityException e) {
+            } catch (SecurityException|IllegalStateException e) {
                 Log.w(TAG, "Failed to unpin shortcut", e);
                 mWasLastCallSuccess = false;
             }
@@ -127,7 +127,7 @@
             try {
                 mLauncherApps.pinShortcuts(packageName, pinnedIds, user.getUser());
                 mWasLastCallSuccess = true;
-            } catch (SecurityException e) {
+            } catch (SecurityException|IllegalStateException e) {
                 Log.w(TAG, "Failed to pin shortcut", e);
                 mWasLastCallSuccess = false;
             }
@@ -142,7 +142,7 @@
                 mLauncherApps.startShortcut(packageName, id, sourceBounds,
                         startActivityOptions, user.getUser());
                 mWasLastCallSuccess = true;
-            } catch (SecurityException e) {
+            } catch (SecurityException|IllegalStateException e) {
                 Log.e(TAG, "Failed to start shortcut", e);
                 mWasLastCallSuccess = false;
             }
@@ -157,7 +157,7 @@
                         shortcutInfo.getShortcutInfo(), density);
                 mWasLastCallSuccess = true;
                 return icon;
-            } catch (SecurityException e) {
+            } catch (SecurityException|IllegalStateException e) {
                 Log.e(TAG, "Failed to get shortcut icon", e);
                 mWasLastCallSuccess = false;
             }
@@ -208,7 +208,7 @@
             try {
                 shortcutInfos = mLauncherApps.getShortcuts(q, user.getUser());
                 mWasLastCallSuccess = true;
-            } catch (SecurityException e) {
+            } catch (SecurityException|IllegalStateException e) {
                 Log.e(TAG, "Failed to query for shortcuts", e);
                 mWasLastCallSuccess = false;
             }