diff --git a/homeassistant/components/rollershutter/zwave.py b/homeassistant/components/rollershutter/zwave.py
index 81b891d7bf1..e767a99adb0 100644
--- a/homeassistant/components/rollershutter/zwave.py
+++ b/homeassistant/components/rollershutter/zwave.py
@@ -56,7 +56,12 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, RollershutterDevice):
     @property
     def current_position(self):
         """Return the current position of Zwave roller shutter."""
-        return self._value.data
+        if self._value.data <= 5:
+            return 100
+        elif self._value.data >= 95:
+            return 0
+        else:
+            return None
 
     def move_up(self, **kwargs):
         """Move the roller shutter up."""