diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 16f51e842..f5dc5931a 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -257,6 +257,8 @@ build_flags             = ${env:tasmota32_base.build_flags}
                           -DFIRMWARE_IR
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-ir.bin"'
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_ssl
+lib_ignore              = ${env:tasmota32_base.lib_ignore}
+                          Micro-RTSP
 
 [env:tasmota32-zbbrdgpro]
 extends                 = env:tasmota32_base
@@ -271,6 +273,11 @@ custom_files_upload     = ${env:tasmota32_base.custom_files_upload}
                           tasmota/berry/zigbee/sonoff_zb_pro_flasher.be
                           tools/fw_SonoffZigbeeBridgePro_cc2652/SonoffZBPro_coord_20220219.hex
 lib_extra_dirs          = lib/lib_basic, lib/lib_ssl, lib/libesp32
+lib_ignore              = ${env:tasmota32_base.lib_ignore}
+                          Micro-RTSP
+                          IRremoteESP8266
+                          TasmotaModbus
+                          ESP Mail Client
 custom_sdkconfig        = CONFIG_D0WD_PSRAM_CLK_IO=5
                           CONFIG_D0WD_PSRAM_CS_IO=18
 
diff --git a/tasmota/include/tasmota_configurations_ESP32.h b/tasmota/include/tasmota_configurations_ESP32.h
index 21343be87..07973b225 100644
--- a/tasmota/include/tasmota_configurations_ESP32.h
+++ b/tasmota/include/tasmota_configurations_ESP32.h
@@ -515,6 +515,9 @@
 
 #define USE_ENHANCED_GUI_WIFI_SCAN
 
+#undef USE_ENERGY_SENSOR                        // Disable support for energy sensors
+#undef USE_SHUTTER                              // Disable support for shutter
+#undef USE_IR_REMOTE                            // Disable support for IR Remote
 #undef USE_ARMTRONIX_DIMMERS                    // Disable support for Armtronix Dimmers (+1k4 code)
 #undef USE_PS_16_DZ                             // Disable support for PS-16-DZ Dimmer (+2k code)
 #undef USE_SONOFF_IFAN                          // Disable support for Sonoff iFan02 and iFan03 (+2k code)