diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index ebdb21e002f6c..4adfc3fb7d45f 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -7187,7 +7187,7 @@ public class PackageManagerService extends IPackageManager.Stub {
                         numberOfPackagesToDexopt + ": " + pkg.packageName);
             }
 
-            if (!isFirstBoot()) {
+            if (mIsPreNUpgrade) {
                 try {
                     ActivityManagerNative.getDefault().showBootMessage(
                             mContext.getResources().getString(R.string.android_upgrading_apk,