diff --git a/src/core/system.cpp b/src/core/system.cpp
index d137cd130..c5668450a 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -2321,9 +2321,9 @@ void System::set_valid_system_gpios() {
 #elif CONFIG_IDF_TARGET_ESP32S2
     valid_gpios_ = string_range_to_vector("0-14, 19, 20, 21, 33-38, 45, 46");
 #elif CONFIG_IDF_TARGET_ESP32S3
-    valid_gpios_ = string_range_to_vector("0-2, 4-14, 17, 18, 21, 33-38, 45, 46");
+    valid_gpios_ = string_range_to_vector("0-14, 17, 18, 21, 33-38, 45, 46");
 #elif CONFIG_IDF_TARGET_ESP32 || defined(EMSESP_STANDALONE)
-    valid_system_gpios_ = string_range_to_vector("0, 2, 4, 5, 12-15, 18, 19, 23, 25-27, 32-39");
+    valid_system_gpios_ = string_range_to_vector("0-2, 4, 5, 12-19, 23, 25-27, 32-39");
 #else
 #endif