diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 394c8fb731562..29bf2ae90d89c 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -410,7 +410,7 @@ public final class Settings implements Watchable, Snappable {
         int[] excludedUserIds;
     }
 
-    private static int mFirstAvailableUid = 0;
+    private static int mFirstAvailableUid = Process.FIRST_APPLICATION_UID;
 
     /** Map from volume UUID to {@link VersionInfo} */
     @Watched
@@ -4271,7 +4271,7 @@ public final class Settings implements Watchable, Snappable {
     private int acquireAndRegisterNewAppIdLPw(SettingBase obj) {
         // Let's be stupidly inefficient for now...
         final int size = mAppIds.size();
-        for (int i = mFirstAvailableUid; i < size; i++) {
+        for (int i = mFirstAvailableUid - Process.FIRST_APPLICATION_UID; i < size; i++) {
             if (mAppIds.get(i) == null) {
                 mAppIds.set(i, obj);
                 return Process.FIRST_APPLICATION_UID + i;