diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_3F/A5_3F_7F_EltakoFSB.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_3F/A5_3F_7F_EltakoFSB.java
index 77a591480af..0cec0c44457 100644
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_3F/A5_3F_7F_EltakoFSB.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_3F/A5_3F_7F_EltakoFSB.java
@@ -76,7 +76,11 @@ public class A5_3F_7F_EltakoFSB extends _4BSMessage {
                                 (Math.abs(current.intValue() - percentCommand.intValue()) * shutTime)
                                         / PercentType.HUNDRED.intValue());
 
-                        setData(ZERO, duration, direction, TEACHIN_BIT);
+                        if (duration == 0) {
+                            setData(ZERO, (byte) 0xFF, STOP, TEACHIN_BIT);
+                        } else {
+                            setData(ZERO, duration, direction, TEACHIN_BIT);
+                        }
                     }
                 }
             }