diff --git a/src/onboarding/onboarding-core-config.ts b/src/onboarding/onboarding-core-config.ts
index 50cb216d87..d1d732d51c 100644
--- a/src/onboarding/onboarding-core-config.ts
+++ b/src/onboarding/onboarding-core-config.ts
@@ -156,13 +156,11 @@ class OnboardingCoreConfig extends LitElement {
           type="number"
           .disabled=${this._working}
           .value=${this._elevationValue}
+          .suffix=${this.hass.localize(
+            "ui.panel.config.core.section.core.core_config.elevation_meters"
+          )}
           @change=${this._handleChange}
         >
-          <span slot="suffix">
-            ${this.hass.localize(
-              "ui.panel.config.core.section.core.core_config.elevation_meters"
-            )}
-          </span>
         </ha-textfield>
       </div>
 
diff --git a/src/panels/config/core/ha-config-section-general.ts b/src/panels/config/core/ha-config-section-general.ts
index 10d9ffe10f..462f23fd9a 100644
--- a/src/panels/config/core/ha-config-section-general.ts
+++ b/src/panels/config/core/ha-config-section-general.ts
@@ -118,13 +118,11 @@ class HaConfigSectionGeneral extends LitElement {
                 type="number"
                 .disabled=${disabled}
                 .value=${this._elevation}
+                .suffix=${this.hass.localize(
+                  "ui.panel.config.core.section.core.core_config.elevation_meters"
+                )}
                 @change=${this._handleChange}
               >
-                <span slot="suffix">
-                  ${this.hass.localize(
-                    "ui.panel.config.core.section.core.core_config.elevation_meters"
-                  )}
-                </span>
               </ha-textfield>
               <div>
                 <div>