diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6382c1f2..11631b509 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,6 @@ All notable changes to this project will be documented in this file.
 ## [13.3.0.2]
 ### Added
 - HASPmota type `chart` (#20372)
-- ESP32 experimental support GPIOViewer when ``define USE_ESP32_GPIO_VIEWER`` is enabled
 
 ### Breaking Changed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f566b94db..6198b8991 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -124,7 +124,6 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - NeoPool hydrolysis FL1 and Redox flag [#20258](https://github.com/arendst/Tasmota/issues/20258)
 - Support negative power on BL0942 using index 5..8 [#20322](https://github.com/arendst/Tasmota/issues/20322)
 - ESP32 used UART information
-- ESP32 experimental support GPIOViewer when ``define USE_ESP32_GPIO_VIEWER`` is enabled
 - Berry `introspect.set()` for class attributes [#20339](https://github.com/arendst/Tasmota/issues/20339)
 - HASPmota `haspmota.page_show()` to change page [#20333](https://github.com/arendst/Tasmota/issues/20333)
 - HASPmota type `chart` [#20372](https://github.com/arendst/Tasmota/issues/20372)
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index aa8802215..7febc7a3b 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -17,12 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-//#define USE_ESP32_GPIO_VIEWER
-#ifdef USE_ESP32_GPIO_VIEWER
-#include <gpio_viewer.h> // Must me the first include in your project
-GPIOViewer gpio_viewer;
-#endif  // USE_ESP32_GPIO_VIEWER
-
 // Location specific includes
 #ifndef ESP32_STAGE                         // ESP32 Stage has no core_version.h file. Disable include via PlatformIO Option
 #include <core_version.h>                   // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_7_1)
@@ -898,15 +892,6 @@ void Scheduler(void) {
 #ifndef SYSLOG_UPDATE_SECOND
   SyslogAsync(false);
 #endif  // SYSLOG_UPDATE_SECOND
-
-#ifdef USE_ESP32_GPIO_VIEWER
-  static bool gpio_viewer_wifi_connected = false;
-  if (!gpio_viewer_wifi_connected && !TasmotaGlobal.global_state.network_down) {
-    gpio_viewer_wifi_connected = true;
-    gpio_viewer.setSamplingInterval(200);  // You can set the sampling interval in ms, if not set default is 100ms
-    gpio_viewer.begin();
-  }
-#endif  // USE_ESP32_GPIO_VIEWER
 }
 
 void loop(void) {