diff --git a/src/common/const.ts b/src/common/const.ts
index bee36ffee8..4f7399aef6 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -60,6 +60,7 @@ import {
   mdiWaterPercent,
   mdiWeatherCloudy,
   mdiWeatherPouring,
+  mdiWeatherWindy,
   mdiWeight,
   mdiWhiteBalanceSunny,
   mdiWifi,
@@ -159,6 +160,7 @@ export const FIXED_DEVICE_CLASS_ICONS = {
   volume: mdiCarCoolantLevel,
   water: mdiWater,
   weight: mdiWeight,
+  wind_speed: mdiWeatherWindy,
 };
 
 /** Domains that have a state card. */
diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index 071f65f02f..a9e64b182c 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -124,6 +124,7 @@ const OVERRIDE_SENSOR_UNITS = {
   volume: ["fl. oz.", "ft³", "gal", "L", "mL", "m³"],
   water: ["ft³", "gal", "L", "m³"],
   weight: ["g", "kg", "lb", "mg", "oz", "µg"],
+  wind_speed: ["ft/s", "km/h", "kn", "mph", "m/s"],
 };
 
 const OVERRIDE_WEATHER_UNITS = {
@@ -131,7 +132,7 @@ const OVERRIDE_WEATHER_UNITS = {
   pressure: ["hPa", "mbar", "mmHg", "inHg"],
   temperature: ["°C", "°F"],
   visibility: ["km", "mi"],
-  wind_speed: ["ft/s", "km/h", "kn", "mph", "m/s"],
+  wind_speed: ["ft/s", "km/h", "kn", "m/s", "mph"],
 };
 
 const SWITCH_AS_DOMAINS = ["cover", "fan", "light", "lock", "siren"];