diff --git a/src/onboarding/onboarding-core-config.ts b/src/onboarding/onboarding-core-config.ts
index eef93d1b54..46621294f4 100644
--- a/src/onboarding/onboarding-core-config.ts
+++ b/src/onboarding/onboarding-core-config.ts
@@ -128,9 +128,9 @@ class OnboardingCoreConfig extends LitElement {
       </div>
 
       <div class="row">
-        <ha-country-picker 
+        <ha-country-picker
           class="flex"
-          .language=${this.hass.locale.language} 
+          .language=${this.hass.locale.language}
           .label=${
             this.hass.localize(
               "ui.panel.config.core.section.core.core_config.country"
@@ -335,12 +335,12 @@ class OnboardingCoreConfig extends LitElement {
     ]
   );
 
-  private _handleValueChanged(ev) {
-    const target = ev.currentTarget;
+  private _handleValueChanged(ev: ValueChangedEvent<string>) {
+    const target = ev.currentTarget as HTMLElement;
     this[`_${target.getAttribute("name")}`] = ev.detail.value;
   }
 
-  private _handleChange(ev: ValueChangedEvent<string>) {
+  private _handleChange(ev: Event) {
     const target = ev.currentTarget as HaTextField;
     this[`_${target.name}`] = target.value;
   }
diff --git a/src/panels/config/core/ha-config-section-general.ts b/src/panels/config/core/ha-config-section-general.ts
index 59899d0984..1d9e3794c0 100644
--- a/src/panels/config/core/ha-config-section-general.ts
+++ b/src/panels/config/core/ha-config-section-general.ts
@@ -27,7 +27,8 @@ import { ConfigUpdateValues, saveCoreConfig } from "../../../data/core";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
 import "../../../layouts/hass-subpage";
 import { haStyle } from "../../../resources/styles";
-import type { HomeAssistant } from "../../../types";
+import type { HomeAssistant, ValueChangedEvent } from "../../../types";
+import type { HaTextField } from "../../../components/ha-textfield";
 
 @customElement("ha-config-section-general")
 class HaConfigSectionGeneral extends LitElement {
@@ -301,13 +302,13 @@ class HaConfigSectionGeneral extends LitElement {
     this._updateUnits = true;
   }
 
-  private _handleValueChanged(ev) {
-    const target = ev.currentTarget;
-    this[`_${target.name}`] = ev.detail.value;
+  private _handleValueChanged(ev: ValueChangedEvent<string>) {
+    const target = ev.currentTarget as HTMLElement;
+    this[`_${target.getAttribute("name")}`] = ev.detail.value;
   }
 
-  private _handleChange(ev) {
-    const target = ev.currentTarget;
+  private _handleChange(ev: Event) {
+    const target = ev.currentTarget as HaTextField;
     this[`_${target.name}`] = target.value;
   }