diff --git a/fittrackee_client/src/components/Workout/WorkoutDetail/WeatherWind.vue b/fittrackee_client/src/components/Workout/WorkoutDetail/WeatherWind.vue
index 255acf53..069f73ab 100644
--- a/fittrackee_client/src/components/Workout/WorkoutDetail/WeatherWind.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutDetail/WeatherWind.vue
@@ -1,13 +1,8 @@
 <template>
   <div class="wind">
-    <Distance
-      :distance="weather.wind"
-      unitFrom="m"
-      :digits="1"
-      :displayUnit="false"
-      :useImperialUnits="useImperialUnits"
-    />
-    {{ useImperialUnits ? 'ft' : 'm' }}/s
+    {{ useImperialUnits ? 
+       convert_mps_to_mph(Number(weather.wind)).toFixed(1) + ' mph' : 
+       Number(weather.wind).toFixed(1) + " m/s" }}
     <div class="wind-bearing">
       <i
         v-if="weather.windBearing"
@@ -45,6 +40,10 @@
       )}`
     )
   }
+
+  function convert_mps_to_mph(windSpeed: number): number {
+    return windSpeed * 2.2369363
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/fittrackee_client/src/locales/de/user.json b/fittrackee_client/src/locales/de/user.json
index 93b82c45..255939bf 100644
--- a/fittrackee_client/src/locales/de/user.json
+++ b/fittrackee_client/src/locales/de/user.json
@@ -94,8 +94,8 @@
         "SUCCESSFUL_UPDATE": "Dein Konto wurde erfolgreich aktualisiert.",
         "UNITS": {
             "LABEL": "Einheiten für die Distanz",
-            "IMPERIAL": "Imperiales System (ft, mi, °F)",
-            "METRIC": "Metrisches System (m, km, °C)"
+            "IMPERIAL": "Imperiales System (ft, mi, mph, °F)",
+            "METRIC": "Metrisches System (m, km, m/s, °C)"
         },
         "TIMEZONE": "Zeitzone"
     },
diff --git a/fittrackee_client/src/locales/en/user.json b/fittrackee_client/src/locales/en/user.json
index 95bc3172..d99eb53e 100644
--- a/fittrackee_client/src/locales/en/user.json
+++ b/fittrackee_client/src/locales/en/user.json
@@ -94,8 +94,8 @@
     "SUCCESSFUL_UPDATE": "Your account has been updated successfully.",
     "UNITS": {
       "LABEL": "Units for distance",
-      "IMPERIAL": "Imperial system (ft, mi, °F)",
-      "METRIC": "Metric system (m, km, °C)"
+      "IMPERIAL": "Imperial system (ft, mi, mph, °F)",
+      "METRIC": "Metric system (m, km, m/s, °C)"
     },
     "TIMEZONE": "Timezone"
   },
diff --git a/fittrackee_client/src/locales/fr/user.json b/fittrackee_client/src/locales/fr/user.json
index c196b772..e8fbeb3d 100644
--- a/fittrackee_client/src/locales/fr/user.json
+++ b/fittrackee_client/src/locales/fr/user.json
@@ -82,8 +82,8 @@
         },
         "UNITS": {
             "LABEL": "Unités pour les distances",
-            "IMPERIAL": "Système impérial (ft, mi, °F)",
-            "METRIC": "Système métrique (m, km, °C)"
+            "IMPERIAL": "Système impérial (ft, mi, mph, °F)",
+            "METRIC": "Système métrique (m, km, m/s, °C)"
         },
         "SPORT": {
             "ACTION": "action",