diff --git a/src/lib/metar.js b/src/lib/metar.js
index 2283566..2eb197c 100644
--- a/src/lib/metar.js
+++ b/src/lib/metar.js
@@ -45,8 +45,8 @@ export function decodeMetar(metar) {
         return {
           runway: id,
           heading,
-          crosswind: Math.round(crosswind),
-          headwind: Math.round(headwind),
+          crosswind: windDir === 'variable' ? effectiveWind : Math.round(crosswind),
+          headwind: windDir === 'variable' ? 0 : Math.round(headwind),
         };
       });