diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index bf80a466e0343..6a05ec1f1e746 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2876,8 +2876,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService
         synchronized (mLock) {
             mPackageUsage.writeNow(mSettings.getPackagesLocked());
 
-            if (mHandler.hasMessages(WRITE_SETTINGS)) {
-                mHandler.removeMessages(WRITE_SETTINGS);
+            if (mHandler.hasMessages(WRITE_SETTINGS)
+                    || mHandler.hasMessages(WRITE_PACKAGE_RESTRICTIONS)
+                    || mHandler.hasMessages(WRITE_PACKAGE_LIST)) {
                 writeSettings();
             }
         }