diff --git a/src/cards/ha-weather-card.js b/src/cards/ha-weather-card.js
index 0f5c568989..df593e3243 100644
--- a/src/cards/ha-weather-card.js
+++ b/src/cards/ha-weather-card.js
@@ -216,9 +216,11 @@ class HaWeatherCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
                       ></ha-icon>
                     </div>
                   </template>
-                  <div class="temp">
-                    [[item.temperature]] [[getUnit('temperature')]]
-                  </div>
+                  <template is="dom-if" if="[[_showValue(item.temperature)]]">
+                    <div class="temp">
+                      [[item.temperature]] [[getUnit('temperature')]]
+                    </div>
+                  </template>
                   <template is="dom-if" if="[[_showValue(item.templow)]]">
                     <div class="templow">
                       [[item.templow]] [[getUnit('temperature')]]
diff --git a/src/common/entity/domain_icon.ts b/src/common/entity/domain_icon.ts
index 9971b9e66c..665897b187 100644
--- a/src/common/entity/domain_icon.ts
+++ b/src/common/entity/domain_icon.ts
@@ -42,6 +42,7 @@ const fixedIcons = {
   updater: "hass:cloud-upload",
   vacuum: "hass:robot-vacuum",
   water_heater: "hass:thermometer",
+  weather: "hass:weather-cloudy",
   weblink: "hass:open-in-new",
 };
 
diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts
index bdbfc9c969..c6a9e1b332 100644
--- a/src/onboarding/onboarding-integrations.ts
+++ b/src/onboarding/onboarding-integrations.ts
@@ -151,7 +151,10 @@ class OnboardingIntegrations extends LitElement {
       getConfigEntries(this.hass!),
     ]);
     this._discovered = discovered;
-    this._entries = entries;
+    // We filter out the config entry for the local weather.
+    // It is one that we create automatically and it will confuse the user
+    // if it starts showing up during onboarding.
+    this._entries = entries.filter((entry) => entry.domain !== "met");
   }
 
   private async _finish() {