diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c
index 9723a31a600..8c16bedc1ca 100644
--- a/keyboards/tzarc/djinn/djinn.c
+++ b/keyboards/tzarc/djinn/djinn.c
@@ -209,9 +209,9 @@ void housekeeping_task_kb(void) {
     // Match the backlight to the LCD state
     if (is_keyboard_master() && is_backlight_enabled() != peripherals_on) {
         if (peripherals_on)
-            backlight_enable();
+            backlight_enable_noeeprom();
         else
-            backlight_disable();
+            backlight_disable_noeeprom();
     }
 
     // Draw the UI
diff --git a/quantum/backlight/backlight.c b/quantum/backlight/backlight.c
index a7d2a45a515..86d1dc84704 100644
--- a/quantum/backlight/backlight.c
+++ b/quantum/backlight/backlight.c
@@ -107,32 +107,44 @@ void backlight_toggle(void) {
 
 /** \brief Enable backlight
  *
- * FIXME: needs doc
+ *  FIXME: needs doc
  */
-void backlight_enable(void) {
+void backlight_enable_noeeprom(void) {
     if (backlight_config.enable) return; // do nothing if backlight is already on
 
     backlight_config.enable = true;
     if (backlight_config.raw == 1) // enabled but level == 0
         backlight_config.level = 1;
-    eeconfig_update_backlight(&backlight_config);
     dprintf("backlight enable\n");
     backlight_set(backlight_config.level);
 }
 
+void backlight_enable(void) {
+    if (backlight_config.enable) return; // do nothing if backlight is already on
+
+    backlight_enable_noeeprom();
+    eeconfig_update_backlight(&backlight_config);
+}
+
 /** \brief Disable backlight
  *
- * FIXME: needs doc
+ *  FIXME: needs doc
  */
-void backlight_disable(void) {
+void backlight_disable_noeeprom(void) {
     if (!backlight_config.enable) return; // do nothing if backlight is already off
 
     backlight_config.enable = false;
-    eeconfig_update_backlight(&backlight_config);
     dprintf("backlight disable\n");
     backlight_set(0);
 }
 
+void backlight_disable(void) {
+    if (!backlight_config.enable) return; // do nothing if backlight is already off
+
+    backlight_disable_noeeprom();
+    eeconfig_update_backlight(&backlight_config);
+}
+
 /** /brief Get the backlight status
  *
  * FIXME: needs doc
diff --git a/quantum/backlight/backlight.h b/quantum/backlight/backlight.h
index 2faa8fc4f2e..2c4b71eccb7 100644
--- a/quantum/backlight/backlight.h
+++ b/quantum/backlight/backlight.h
@@ -51,7 +51,9 @@ STATIC_ASSERT(sizeof(backlight_config_t) == sizeof(uint8_t), "Backlight EECONFIG
 void    backlight_init(void);
 void    backlight_toggle(void);
 void    backlight_enable(void);
+void    backlight_enable_noeeprom(void);
 void    backlight_disable(void);
+void    backlight_disable_noeeprom(void);
 bool    is_backlight_enabled(void);
 void    backlight_step(void);
 void    backlight_increase(void);