diff --git a/tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino b/tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino
index 809ec86ac..53c9a2110 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino
@@ -88,7 +88,7 @@ void Shift595SwitchRelay(void) {
 }
 
 void CmndShift595Devices(void) {
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 3)) {
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload * 8 <= MAX_RELAYS_SET - Shift595->first)) {
     Settings->shift595_device_count = (1 == XdrvMailbox.payload) ? SHIFT595_DEVICE_COUNT : XdrvMailbox.payload;
     TasmotaGlobal.restart_flag = 2;
   }