diff --git a/CHANGELOG.md b/CHANGELOG.md
index b69126e3e..49356dc24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased] - Development
 
 ## [9.5.0.1]
+### Changed
+- Force ESP32 defines USE_UFILESYS, GUI_TRASH_FILE and #define GUI_EDIT_FILE
 
 ## [Released]
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b3d0f951e..f13931f44 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -99,6 +99,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 ### Added
 
 ### Changed
+- Force ESP32 defines USE_UFILESYS, GUI_TRASH_FILE and #define GUI_EDIT_FILE
 
 ### Fixed
 
diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index 6d2a40352..6669c4a4b 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -34,7 +34,6 @@
 
 #define USE_WEBCAM
 #define ENABLE_RTSPSERVER
-#define USE_UFILESYS
 #define USE_SDCARD
   #define GUI_TRASH_FILE
 #define USE_SPI
@@ -58,10 +57,7 @@
 #define FALLBACK_MODULE        ODROID_GO         // [Module2] Select default module on fast reboot where USER_MODULE is user template
 
 #define USE_ODROID_GO                            // Add support for Odroid Go
-#define USE_UFILESYS
 #define USE_SDCARD
-  #define GUI_TRASH_FILE
-  #define GUI_EDIT_FILE
 
 #ifdef USE_BERRY                                 // Berry scripting language
   #define USE_BERRY_PSRAM                        // Allocate Berry memory in PSRAM if PSRAM is connected - this might be slightly slower but leaves main memory intact
@@ -95,10 +91,7 @@
 #define USE_M5STACK_CORE2                        // Add support for M5Stack Core2
   #define USE_I2S_SAY_TIME
   #define USE_I2S_WEBRADIO
-#define USE_UFILESYS
 #define USE_SDCARD
-  #define GUI_TRASH_FILE
-  #define GUI_EDIT_FILE
 
 #ifdef USE_BERRY                                 // Berry scripting language
   #define USE_BERRY_PSRAM                        // Allocate Berry memory in PSRAM if PSRAM is connected - this might be slightly slower but leaves main memory intact
@@ -159,10 +152,7 @@
 #undef FALLBACK_MODULE
 #define FALLBACK_MODULE        WEMOS             // [Module2] Select default module on fast reboot where USER_MODULE is user template
 
-#define USE_UFILESYS
 #define USE_SDCARD
-  #define GUI_TRASH_FILE
-  #define GUI_EDIT_FILE
 
 #define USE_ADC
 #undef USE_BERRY                                 // Disable Berry scripting language
@@ -179,10 +169,7 @@
 
 #define USE_ENHANCED_GUI_WIFI_SCAN
 
-#define USE_UFILESYS
 #define USE_SDCARD
-  #define GUI_TRASH_FILE
-  #define GUI_EDIT_FILE
 
 #define ROTARY_V1                                // Add support for Rotary Encoder as used in MI Desk Lamp
 
diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h
index abb925aee..b481325b5 100644
--- a/tasmota/tasmota_globals.h
+++ b/tasmota/tasmota_globals.h
@@ -131,6 +131,8 @@ String EthernetMacAddress(void);
 #endif  // ARDUINO_ESP32_RELEASE
 
 #define USE_UFILESYS
+#define GUI_TRASH_FILE
+#define GUI_EDIT_FILE
 
 #undef FIRMWARE_MINIMAL                            // Minimal is not supported as not needed