diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_4c_devices.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_4c_devices.ino
index 99499d293..259249696 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_4c_devices.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_4c_devices.ino
@@ -355,19 +355,6 @@ bool loadZigbeeDevices(void) {
   const char * storage_class = PSTR("");
   uint32_t file_version = 4;        // currently supporting v3 and v4
 
-#ifdef USE_ZIGBEE_EEPROM
-  if (zigbee.eeprom_ready) {
-    f.init(ZIGB_NAME4);                   // try v4 first
-    if (!f.valid()) {
-      f.init(ZIGB_NAME2);                 // else try v2
-      if (f.valid()) { file_version = 2; }  // v2 found
-    }
-    if (f.valid()) {
-      storage_class = PSTR("EEPROM");
-    }
-  }
-#endif // USE_ZIGBEE_EEPROM
-
 #ifdef USE_UFILESYS
   File file;
   if (!f.valid() && dfsp) {
@@ -383,6 +370,19 @@ bool loadZigbeeDevices(void) {
   }
 #endif // USE_UFILESYS
 
+#ifdef USE_ZIGBEE_EEPROM
+  if (!f.valid() && zigbee.eeprom_ready) {
+    f.init(ZIGB_NAME4);                   // try v4 first
+    if (!f.valid()) {
+      f.init(ZIGB_NAME2);                 // else try v2
+      if (f.valid()) { file_version = 2; }  // v2 found
+    }
+    if (f.valid()) {
+      storage_class = PSTR("EEPROM");
+    }
+  }
+#endif // USE_ZIGBEE_EEPROM
+
 #ifdef ESP8266
   if (!f.valid() && flash_valid()) {
     // Read binary data from Flash