diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 7a28e3917e0..058b6432d0d 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -110,13 +110,12 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
     }
 
     private void applyTheme() {
+        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
         if (ThemeHelper.trySetDynamicColor(this)) {
             final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
                     ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
                     : R.style.SudDynamicColorThemeSettings_SetupWizard;
             setTheme(appliedTheme);
-        } else {
-            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
         }
     }
 
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 72770be7f09..12bada2b0d7 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -95,13 +95,12 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
         // Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
         final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
         if (isAnySetupWizard && this instanceof SubSettings) {
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             if (ThemeHelper.trySetDynamicColor(this)) {
                 final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
                         ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight
                         : R.style.SudDynamicColorThemeSettings_SetupWizard;
                 setTheme(appliedTheme);
-            } else {
-                setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             }
         }