diff --git a/examples/companion_radio/NodePrefs.h b/examples/companion_radio/NodePrefs.h
index d2a011bfd..c79e2f0fe 100644
--- a/examples/companion_radio/NodePrefs.h
+++ b/examples/companion_radio/NodePrefs.h
@@ -183,6 +183,6 @@ public:
   CommonRadioPrefs* getRadioPrefs() { return &radio; }
   KeyValueStore* getCustom() { return &custom; }
 
-  bool isDirty() const override { return ConfigSerializer::isDirty() || radio.isDirty(); }
-  void clearDirty() override { ConfigSerializer::clearDirty(); radio.clearDirty(); }
+  bool isDirty() const override { return ConfigSerializer::isDirty() || radio.isDirty() || custom.isDirty(); }
+  void clearDirty() override { ConfigSerializer::clearDirty(); radio.clearDirty(); custom.clearDirty(); }
 };
diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h
index 3fb03dc5f..17b3da876 100644
--- a/src/helpers/CommonCLI.h
+++ b/src/helpers/CommonCLI.h
@@ -236,8 +236,8 @@ public:
   CommonRadioPrefs* getRadioPrefs() { return &radio; }
   KeyValueStore* getCustom() { return &custom; }
 
-  bool isDirty() const override { return ConfigSerializer::isDirty() || radio.isDirty(); }
-  void clearDirty() override { ConfigSerializer::clearDirty(); radio.clearDirty(); }
+  bool isDirty() const override { return ConfigSerializer::isDirty() || radio.isDirty() || custom.isDirty(); }
+  void clearDirty() override { ConfigSerializer::clearDirty(); radio.clearDirty(); custom.clearDirty(); }
 };
 
 class CommonCLICallbacks {
diff --git a/src/helpers/DynamicConfigSerializer.cpp b/src/helpers/DynamicConfigSerializer.cpp
index 7ec6dc4ef..dc08d7d78 100644
--- a/src/helpers/DynamicConfigSerializer.cpp
+++ b/src/helpers/DynamicConfigSerializer.cpp
@@ -38,6 +38,7 @@ bool DynamicConfigSerializer::setByKey(const char* key, const char* value) {
     strcat(new_config, KEY_SEP_STR);
     strcat(new_config, value);
     strcpy(_config, new_config);  // commit new serialized string
+    markDirty();
     return true;
   }
   return false;   // didn't fit in _config[]