diff --git a/custom_components/xiaomi_home/fan.py b/custom_components/xiaomi_home/fan.py
index 4e88217f..9a72d2e7 100644
--- a/custom_components/xiaomi_home/fan.py
+++ b/custom_components/xiaomi_home/fan.py
@@ -55,6 +55,7 @@
 from homeassistant.components.fan import (
     FanEntity,
     FanEntityFeature,
+    DIRECTION_FORWARD,
     DIRECTION_REVERSE
 )
 from homeassistant.util.percentage import (
@@ -269,7 +270,7 @@ async def async_set_direction(self, direction: str) -> None:
             prop=self._prop_wind_reverse,
             value=(
                 self._prop_wind_reverse_reverse
-                if self.current_direction == DIRECTION_REVERSE
+                if direction == DIRECTION_REVERSE
                 else self._prop_wind_reverse_forward))
 
     async def async_oscillate(self, oscillating: bool) -> None:
@@ -298,9 +299,9 @@ def current_direction(self) -> Optional[str]:
         """Return the current direction of the fan."""
         if not self._prop_wind_reverse:
             return None
-        return 'reverse' if self.get_prop_value(
+        return DIRECTION_REVERSE if self.get_prop_value(
             prop=self._prop_wind_reverse
-        ) == self._prop_wind_reverse_reverse else 'forward'
+        ) == self._prop_wind_reverse_reverse else DIRECTION_FORWARD
 
     @property
     def percentage(self) -> Optional[int]: