diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2b154511..326f032e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Command ``SetOption163 1`` to disable display of Device name in GUI header
 - Berry `animate.crenel` primitive (#22673)
+- Berry scroll to Leds_matrix (#22693)
 
 ### Breaking Changed
 
@@ -14,14 +15,15 @@ All notable changes to this project will be documented in this file.
 - ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK true` (#21266)
 - TLS disable ECDSA for MQTT to ensure we don't break fingerprints after #22649
 - GPIOViewer from v1.5.6 to v1.5.8
-- HASPmota use 'roboto.ttf' for automatic sizing of default font
-- HASPmota add 'tag' attribute for free-form JSON
+- HASPmota use 'roboto.ttf' for automatic sizing of default font (#22697)
+- HASPmota add 'tag' attribute for free-form JSON (#22698)
+- Postpone save_data during light animation when fade is Off
 
 ### Fixed
 - Berry Zigbee fix wrong attributes (#22684)
 - Berry walrus operator (#22685)
 - Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` (#22686)
-- LVGL updated `Antiburn.tapp`
+- LVGL updated `Antiburn.tapp` (#22699)
 
 ### Removed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b0d172c82..4114cafc9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -118,16 +118,21 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 ### Added
 - Command ``SetOption163 1`` to disable display of Device name in GUI header
 - Berry `animate.crenel` primitive [#22673](https://github.com/arendst/Tasmota/issues/22673)
+- Berry scroll to Leds_matrix [#22693](https://github.com/arendst/Tasmota/issues/22693)
 
 ### Breaking Changed
 
 ### Changed
 - GPIOViewer from v1.5.6 to v1.5.8
+- Postpone save_data during light animation when fade is Off
 - ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK true` [#21266](https://github.com/arendst/Tasmota/issues/21266)
+- HASPmota use 'roboto.ttf' for automatic sizing of default font [#22697](https://github.com/arendst/Tasmota/issues/22697)
+- HASPmota add 'tag' attribute for free-form JSON [#22698](https://github.com/arendst/Tasmota/issues/22698)
 
 ### Fixed
 - Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` [#22686](https://github.com/arendst/Tasmota/issues/22686)
 - Berry Zigbee fix wrong attributes [#22684](https://github.com/arendst/Tasmota/issues/22684)
 - Berry walrus operator [#22685](https://github.com/arendst/Tasmota/issues/22685)
+- LVGL updated `Antiburn.tapp` [#22699](https://github.com/arendst/Tasmota/issues/22699)
 
 ### Removed
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino b/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
index 638b5bb6d..203c927b4 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
@@ -1803,6 +1803,10 @@ void LightAnimate(void)
       sleep_previous = TasmotaGlobal.sleep;     // save previous value of sleep
       TasmotaGlobal.sleep = PWM_MAX_SLEEP;      // set a maximum value (in milliseconds) to sleep to ensure that animations are smooth
     }
+    if (Settings->save_data) {
+      // Postpone save_data during animation
+      TasmotaGlobal.save_data_counter = 2;
+    }
   } else {
     if (sleep_previous > 0) {
       TasmotaGlobal.sleep = sleep_previous;