From e17a83c51040c729a4caaa06841f6f88f4313cfc Mon Sep 17 00:00:00 2001
From: gudinis <86497200+gudinis@users.noreply.github.com>
Date: Sat, 5 Sep 2026 08:56:40 -0300
Subject: [PATCH] Matter: fix autoconfiguration after configuration reset
 (#24997)

---
 .../berry_matter/src/embedded/Matter_zz_Device.be         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_zz_Device.be b/lib/libesp32/berry_matter/src/embedded/Matter_zz_Device.be
index f53b767e8..117aae9fe 100644
--- a/lib/libesp32/berry_matter/src/embedded/Matter_zz_Device.be
+++ b/lib/libesp32/berry_matter/src/embedded/Matter_zz_Device.be
@@ -553,13 +553,17 @@ class Matter_Device
       self.ipv4only = bool(j.find("ipv4only", false))
       self.disable_bridge_mode = bool(j.find("disable_bridge_mode", false))
       self.next_ep = j.find("nextep", self.next_ep)
-      self.plugins_config = j.find("config", {})
-      self.debug = bool(j.find("debug"))    # bool converts nil to false
+      self.plugins_config = j.find("config", nil)
+      self.debug = bool(j.find("debug"))
+
       if self.plugins_config != nil
         log(f"MTR: Load_config = {self.plugins_config}", 3)
         self.adjust_next_ep()
         dirty = self.check_config_ep()
         self.plugins_persist = true
+      else
+        self.plugins_config = {}
+        self.plugins_persist = false
       end
       self.plugins_config_remotes = j.find("remotes", {})
       if self.plugins_config_remotes