diff --git a/CHANGELOG.md b/CHANGELOG.md
index 224458501..171c62ad3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased] - Development
 
 ## [9.5.0.1]
+### Added
+- Enable UFILESYS, GUI_TRASH_FILE and GUI_EDIT_FILE for any device compiled with more than 1M flash size
+
 ### Changed
 - ESP32 core library from v1.0.6 to v1.0.7
 - Force ESP32 defines USE_UFILESYS, GUI_TRASH_FILE and #define GUI_EDIT_FILE
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f5fe6f296..76791941a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -97,6 +97,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 
 ## Changelog v9.5.0.1
 ### Added
+- Enable UFILESYS, GUI_TRASH_FILE and GUI_EDIT_FILE for any device compiled with more than 1M flash size
 
 ### Changed
 - ESP32 core library from v1.0.6 to v1.0.7
diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index b099d1494..8f72e305d 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -35,7 +35,6 @@
 #define USE_WEBCAM
 #define ENABLE_RTSPSERVER
 #define USE_SDCARD
-  #define GUI_TRASH_FILE
 #define USE_SPI
 #undef USE_BERRY                                 // Disable Berry scripting language
 #undef  USE_MI_ESP32                             // (ESP32 only) Disable support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
@@ -203,10 +202,7 @@
 #define USE_BERRY                                // Enable 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
 
-#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 fe34a5942..af4aa7a87 100644
--- a/tasmota/tasmota_globals.h
+++ b/tasmota/tasmota_globals.h
@@ -130,10 +130,6 @@ String EthernetMacAddress(void);
 #define ARDUINO_CORE_RELEASE        ARDUINO_ESP32_RELEASE
 #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
 
 // Hardware has no ESP32
@@ -164,6 +160,12 @@ String EthernetMacAddress(void);
  * Mandatory defines satisfying disabled defines
 \*********************************************************************************************/
 
+#ifndef ESP8266_1M
+#define USE_UFILESYS
+#define GUI_TRASH_FILE
+#define GUI_EDIT_FILE
+#endif
+
 #ifdef USE_EMULATION_HUE
 #define USE_EMULATION
 #endif
diff --git a/tasmota/xdrv_98_file_settings_demo.ino b/tasmota/xdrv_98_file_settings_demo.ino
index 306ff648e..e4459aeb7 100644
--- a/tasmota/xdrv_98_file_settings_demo.ino
+++ b/tasmota/xdrv_98_file_settings_demo.ino
@@ -27,7 +27,6 @@
  * To test this file:
  * - Have hardware with at least 2M flash
  * - Enable a board with at least 256k filesystem in platform_override.ini
- * - Enable define USE_UFILESYS in user_config_override.h
 \*********************************************************************************************/
 #warning **** USE_DRV_FILE_DEMO is enabled ****