diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
index f8e24917b..84c79c5d9 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
@@ -1366,7 +1366,7 @@ void CmndShutterMotorDelay(void)
 
 void CmndShutterMode(void)
 {
-  if ( XdrvMailbox.index == 1) {
+  if (!XdrvMailbox.usridx && !XdrvMailbox.data_len) {
     if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAX_MODES)) {
       ShutterGlobal.position_mode =  XdrvMailbox.payload;
       Settings->shutter_mode =  XdrvMailbox.payload;