diff --git a/src/panels/profile/ha-pick-theme-row.ts b/src/panels/profile/ha-pick-theme-row.ts
index 09b6d5e899..7f55bb8bb8 100644
--- a/src/panels/profile/ha-pick-theme-row.ts
+++ b/src/panels/profile/ha-pick-theme-row.ts
@@ -35,10 +35,11 @@ export class HaPickThemeRow extends LitElement {
   protected render(): TemplateResult {
     const hasThemes =
       this.hass.themes.themes && Object.keys(this.hass.themes.themes).length;
-    const curTheme =
-      this.hass.selectedTheme?.theme || this.hass.themes.darkMode
-        ? this.hass.themes.default_dark_theme || this.hass.themes.default_theme
-        : this.hass.themes.default_theme;
+    const curTheme = this.hass.selectedTheme?.theme
+      ? this.hass.selectedTheme?.theme
+      : this.hass.themes.darkMode
+      ? this.hass.themes.default_dark_theme || this.hass.themes.default_theme
+      : this.hass.themes.default_theme;
 
     const themeSettings = this.hass.selectedTheme;