diff --git a/src/sys/gpio/hasp_gpio.cpp b/src/sys/gpio/hasp_gpio.cpp
index d0c4c498..43e262fc 100644
--- a/src/sys/gpio/hasp_gpio.cpp
+++ b/src/sys/gpio/hasp_gpio.cpp
@@ -802,6 +802,12 @@ bool gpioIsSystemPin(uint8_t gpio)
 #endif
 #endif
 
+    if(haspDevice.is_system_pin(gpio)) return true;
+
+#if defined(HASP_USE_CUSTOM)
+    if(custom_pin_in_use(gpio)) return true;
+#endif
+
     return false;
 }
 
diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp
index a398f2a3..57aee5e0 100644
--- a/src/sys/svc/hasp_http.cpp
+++ b/src/sys/svc/hasp_http.cpp
@@ -1549,7 +1549,7 @@ void webHandleGpioConfig()
         for(uint8_t gpio = 0; gpio < NUM_DIGITAL_PINS; gpio++) {
             for(uint8_t id = 0; id < HASP_NUM_GPIO_CONFIG; id++) {
                 hasp_gpio_config_t conf = gpioGetPinConfig(id);
-                if((conf.pin == gpio) && gpioConfigInUse(id) && gpioInUse(gpio) && !gpioIsSystemPin(gpio)) {
+                if((conf.pin == gpio) && gpioConfigInUse(id) && !gpioIsSystemPin(gpio)) {
                     httpMessage += F("<tr><td>");
                     // httpMessage += halGpioName(gpio);
                     httpMessage += haspDevice.gpio_name(gpio).c_str();
diff --git a/user_setups/esp32/arduitouch-esp32_ili9341.ini b/user_setups/esp32/arduitouch-esp32_ili9341.ini
index d71e641d..185c88cb 100644
--- a/user_setups/esp32/arduitouch-esp32_ili9341.ini
+++ b/user_setups/esp32/arduitouch-esp32_ili9341.ini
@@ -20,7 +20,7 @@ build_flags =
     ${touch.xpt2046}
     ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D TFT_DC=4
-    -D TFT_CS=5 
+    -D TFT_CS=5
     -D TFT_RST=22        ; RST
     -D TFT_BCKL=15
     -D TOUCH_CS=14