diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 29768246da757..5c45a14012dc2 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -19,6 +19,7 @@
 #define LOG_TAG "BootAnimation"
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 
+#include <chrono>
 #include <filesystem>
 #include <vector>
 
@@ -716,7 +717,9 @@ bool BootAnimation::findBootAnimationFileInternal(const std::vector<std::string>
 
 void BootAnimation::findBootAnimationFile() {
     ATRACE_CALL();
-    const bool playDarkAnim = android::base::GetIntProperty("ro.boot.theme", 0) == 1;
+    android::base::WaitForProperty("ro.persistent_properties.ready", "true",
+                                   std::chrono::seconds(5));
+    const bool playDarkAnim = android::base::GetIntProperty("persist.sys.theme", 2) == 2;
     const std::string productBootanimationFile = PRODUCT_BOOTANIMATION_DIR +
         android::base::GetProperty("ro.product.bootanim.file", playDarkAnim ?
         PRODUCT_BOOTANIMATION_DARK_FILE : PRODUCT_BOOTANIMATION_FILE);
diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index cc09d380dd8e1..b9219eae5b4fc 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -548,7 +548,7 @@ private void updateSystemProperties() {
         int mode = Secure.getIntForUser(getContext().getContentResolver(), Secure.UI_NIGHT_MODE,
                 mNightMode.get(), 0);
         if (mode == MODE_NIGHT_AUTO || mode == MODE_NIGHT_CUSTOM) {
-            mode = MODE_NIGHT_YES;
+            mode = mComputedNightMode ? MODE_NIGHT_YES : MODE_NIGHT_NO;
         }
         SystemProperties.set(SYSTEM_PROPERTY_DEVICE_THEME, Integer.toString(mode));
     }
@@ -2457,6 +2457,7 @@ private void updateComputedNightModeLocked(boolean activate) {
 
         if (mAttentionModeThemeOverlay != MODE_ATTENTION_THEME_OVERLAY_OFF) {
             mComputedNightMode = mAttentionModeThemeOverlay == MODE_ATTENTION_THEME_OVERLAY_NIGHT;
+            updateSystemProperties();
             return;
         }
         if (mNightMode.get() == MODE_NIGHT_YES || mNightMode.get() == UiModeManager.MODE_NIGHT_NO) {
@@ -2464,10 +2465,12 @@ private void updateComputedNightModeLocked(boolean activate) {
         }
         if (mOverrideNightModeOn && !mComputedNightMode) {
             mComputedNightMode = true;
+            updateSystemProperties();
             return;
         }
         if (mOverrideNightModeOff && mComputedNightMode) {
             mComputedNightMode = false;
+            updateSystemProperties();
             return;
         }
 
@@ -2475,6 +2478,7 @@ private void updateComputedNightModeLocked(boolean activate) {
                 && mTwilightManager.getLastTwilightState() != null)) {
             resetNightModeOverrideLocked();
         }
+        updateSystemProperties();
     }
 
     private boolean resetNightModeOverrideLocked() {