diff --git a/sonoff/support.ino b/sonoff/support.ino
index c728d28eb..cfbce4548 100644
--- a/sonoff/support.ino
+++ b/sonoff/support.ino
@@ -783,12 +783,15 @@ uint8_t ValidPin(uint8_t pin, uint8_t gpio)
 bool ValidGPIO(uint8_t pin, uint8_t gpio)
 {
   bool result = false;
-
+/*
   if (USER_MODULE == Settings.module) {
     result = (ValidPin(pin, gpio) > GPIO_NONE);  // Allow any pin
   } else {
     result = (GPIO_USER == ValidPin(pin, gpio));  // Only allow GPIO_USER pins
   }
+*/
+  result = (GPIO_USER == ValidPin(pin, gpio));  // Only allow GPIO_USER pins
+
   return result;
 }