@@ -1525,6 +1525,7 @@ python scripts/battery_throughput.py
 ## Recent Updates
 
 **2026-06-01**
+- **Fix: high-SOC mid-period export in Amber Evening terminated immediately.** The export triggered at SOC 60.8% (Eve = Amber, headroom deficit 4.99 kWh) but stopped after one tick with "SOC floor reached (59.8% ≤ 75.0%)". Root cause: `maybe_restore_timed_grid_export` was overriding the stored 40% floor with the dynamic period-status-based floor (75% for Amber) even for clipping/high-SOC exports. The dynamic floor is only intended for headroom exports that cross a period boundary mid-run. Clipping and high-SOC exports now use the floor stored at start time (`DAYTIME_TIMED_EXPORT_MIN_SOC_PERCENT = 40%`) rather than the dynamic override.
 - **Fix: crash and blind restart when Solcast drops past periods mid-day.** Two related bugs surfaced when the monitor restarted at 10:38 UTC. (1) The intra-day forecast refresh replaced `today_period_forecast` wholesale with Solcast's 2-period result (Aftn, Eve) while `ordered_period_windows` still held all 3 periods — the coordinator then crashed with `KeyError: 'Morn'`. (2) On restart, `today_period_windows` is empty so the startup flow fell into the intra-day branch, produced `daytime_periods = []`, and fired no handlers for the rest of the day. Fixed by: merging (not replacing) `today_period_forecast` on intra-day refresh; always anchoring window boundaries to the canonical `["Morn","Aftn","Eve"]` triplet on day-reset so windows remain thirds even after a mid-day restart; triggering a day-reset when `ordered_period_windows` is empty at startup; and guarding `_process_period_windows` against any period absent from the forecast.
 
 **2026-05-31**
 
@@ -436,10 +436,14 @@ async def maybe_restore_timed_grid_export(
     is_clipping = timed_export_override.get("is_clipping_export", False)
     clipping_soc_floor = timed_export_override.get("clipping_soc_floor")
     export_soc_floor = timed_export_override.get("export_soc_floor")
-    # Use the caller-supplied current floor when available so that the threshold
-    # reflects the active period's status rather than the status at export start.
+    # For headroom exports, use the dynamically computed floor so that the
+    # threshold reflects the active period's status if a period boundary was
+    # crossed mid-export. For clipping/high-SOC exports the stored floor
+    # (DAYTIME_TIMED_EXPORT_MIN_SOC_PERCENT) is always correct — using the
+    # dynamic Amber floor (75%) would fire immediately when SOC < 75%.
     effective_export_soc_floor = (
-        current_export_soc_floor if current_export_soc_floor is not None else export_soc_floor
+        export_soc_floor if is_clipping
+        else (current_export_soc_floor if current_export_soc_floor is not None else export_soc_floor)
     )
 
     # SOC floor checks: export_soc_floor is evaluated first because it is an
 
@@ -428,6 +428,106 @@ def set_override(state):
         assert result == "restored", "Should restore when SOC is at trigger threshold"
         apply_mode_change.assert_called_once()
 
+    @pytest.mark.asyncio
+    async def test_clipping_export_ignores_dynamic_floor_uses_stored_floor(self):
+        """Clipping/high-SOC export must use its stored floor, not the dynamic period floor.
+
+        Regression: 2026-06-01. Eve = Amber → dynamic floor = 75%. High-SOC export
+        started at SOC 60.8% with stored floor = 40%. The export was terminating
+        immediately because 60.8% <= 75% (dynamic). With the fix, clipping exports
+        always use the stored floor (40%), so 60.8% > 40% → export continues.
+        """
+        from logic.timed_export import maybe_restore_timed_grid_export
+        from config.settings import DAYTIME_TIMED_EXPORT_MIN_SOC_PERCENT
+
+        started_at = datetime(2026, 6, 1, 15, 33, tzinfo=timezone.utc)
+        restore_at = datetime(2026, 6, 1, 18, 5, tzinfo=timezone.utc)
+        now_utc = started_at + timedelta(minutes=5)  # Still within window
+
+        override = {
+            "active": True,
+            "started_at": started_at,
+            "restore_at": restore_at,
+            "restore_mode": SIGEN_MODES["SELF_POWERED"],
+            "restore_mode_label": "SELF_POWERED",
+            "trigger_period": "Eve",
+            "duration_minutes": 152,
+            "is_clipping_export": True,
+            "clipping_soc_floor": None,
+            "export_soc_floor": DAYTIME_TIMED_EXPORT_MIN_SOC_PERCENT,  # 40%
+        }
+
+        saved_state = {}
+
+        def set_override(state):
+            saved_state.update(state)
+
+        fetch_soc = AsyncMock(return_value=59.8)  # Below dynamic Amber floor (75%), above stored (40%)
+        apply_mode_change = AsyncMock(return_value=True)
+
+        result = await maybe_restore_timed_grid_export(
+            timed_export_override=override,
+            set_timed_export_override=set_override,
+            now_utc=now_utc,
+            fetch_soc=fetch_soc,
+            sigen=None,
+            mode_names={},
+            apply_mode_change=apply_mode_change,
+            logger=logger,
+            current_export_soc_floor=75.0,  # Dynamic Amber floor — must be ignored for clipping export
+        )
+
+        assert result == "active", (
+            "Clipping export must not terminate at 59.8% when stored floor is 40%"
+        )
+        apply_mode_change.assert_not_called()
+
+    @pytest.mark.asyncio
+    async def test_clipping_export_restores_at_stored_floor_not_dynamic(self):
+        """Clipping export must restore at the stored floor (40%), not the dynamic one."""
+        from logic.timed_export import maybe_restore_timed_grid_export
+        from config.settings import DAYTIME_TIMED_EXPORT_MIN_SOC_PERCENT
+
+        started_at = datetime(2026, 6, 1, 15, 33, tzinfo=timezone.utc)
+        restore_at = datetime(2026, 6, 1, 18, 5, tzinfo=timezone.utc)
+        now_utc = started_at + timedelta(minutes=5)
+
+        override = {
+            "active": True,
+            "started_at": started_at,
+            "restore_at": restore_at,
+            "restore_mode": SIGEN_MODES["SELF_POWERED"],
+            "restore_mode_label": "SELF_POWERED",
+            "trigger_period": "Eve",
+            "duration_minutes": 152,
+            "is_clipping_export": True,
+            "clipping_soc_floor": None,
+            "export_soc_floor": DAYTIME_TIMED_EXPORT_MIN_SOC_PERCENT,  # 40%
+        }
+
+        saved_state = {}
+
+        def set_override(state):
+            saved_state.update(state)
+
+        fetch_soc = AsyncMock(return_value=39.0)  # Below both 40% stored and 75% dynamic
+        apply_mode_change = AsyncMock(return_value=True)
+
+        result = await maybe_restore_timed_grid_export(
+            timed_export_override=override,
+            set_timed_export_override=set_override,
+            now_utc=now_utc,
+            fetch_soc=fetch_soc,
+            sigen=None,
+            mode_names={},
+            apply_mode_change=apply_mode_change,
+            logger=logger,
+            current_export_soc_floor=75.0,
+        )
+
+        assert result == "restored", "Export must restore when SOC drops below the stored 40% floor"
+        apply_mode_change.assert_called_once()
+
     def test_timed_export_persistence_structure(self):
         """Persisted timed export state should include all required fields."""
         state_to_persist = {