diff --git a/src/onboarding/onboarding-core-config.ts b/src/onboarding/onboarding-core-config.ts
index 6306e8ba64..efbaacc5d2 100644
--- a/src/onboarding/onboarding-core-config.ts
+++ b/src/onboarding/onboarding-core-config.ts
@@ -32,10 +32,6 @@ class OnboardingCoreConfig extends LitElement {
 
   private _elevation = "0";
 
-  private _unitSystem: ConfigUpdateValues["unit_system"] = "metric";
-
-  private _currency: ConfigUpdateValues["currency"] = "EUR";
-
   private _timeZone: ConfigUpdateValues["time_zone"] =
     Intl.DateTimeFormat?.().resolvedOptions?.().timeZone;
 
@@ -43,6 +39,10 @@ class OnboardingCoreConfig extends LitElement {
 
   @state() private _country?: ConfigUpdateValues["country"];
 
+  private _unitSystem?: ConfigUpdateValues["unit_system"];
+
+  private _currency?: ConfigUpdateValues["currency"];
+
   @state() private _error?: string;
 
   @state() private _skipCore = false;
diff --git a/src/onboarding/onboarding-location.ts b/src/onboarding/onboarding-location.ts
index b4b3209a9f..fa5fb385ad 100644
--- a/src/onboarding/onboarding-location.ts
+++ b/src/onboarding/onboarding-location.ts
@@ -336,7 +336,7 @@ class OnboardingLocation extends LitElement {
     );
     try {
       this._places = await searchPlaces(address, this.hass, true, 3);
-      if (this._places?.length === 1) {
+      if (this._places?.length) {
         this._highlightedMarker = this._places[0].place_id;
         this._location = [
           Number(this._places[0].lat),