From 8be195b341d53aa8e8b7a391cdbdf69a9b227acc Mon Sep 17 00:00:00 2001
From: RenatusRo <126881912+RenatusRo@users.noreply.github.com>
Date: Mon, 3 Nov 2025 16:09:11 +0100
Subject: [PATCH] Optimizer: fix panic in prorate on continuousDemand returning
 nil  (#24996)

---
 core/site_optimizer.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/site_optimizer.go b/core/site_optimizer.go
index 2c1eac0e1..ad1b92120 100644
--- a/core/site_optimizer.go
+++ b/core/site_optimizer.go
@@ -200,7 +200,9 @@ func (site *Site) optimizerUpdate(battery []measurement) error {
 
 		case api.ModeNow, api.ModeMinPV:
 			// forced min/max charging
-			bat.PDemand = prorate(continuousDemand(lp, minLen), firstSlotDuration)
+			if demand := continuousDemand(lp, minLen); demand != nil {
+				bat.PDemand = prorate(demand, firstSlotDuration)
+			}
 
 		case api.ModePV:
 			// add plan goal