diff --git a/core/site_optimizer.go b/core/site_optimizer.go
index 03d3c697d..f175fff9e 100644
--- a/core/site_optimizer.go
+++ b/core/site_optimizer.go
@@ -221,6 +221,11 @@ func (site *Site) optimizerUpdate(battery []types.Measurement) error {
 		add(site.batteryRequest(dev, b, grid, minLen, firstSlotDuration))
 	}
 
+	// empty request- all loadpoints disabled
+	if len(req.Batteries) == 0 {
+		return nil
+	}
+
 	httpClient := request.NewClient(site.log)
 	httpClient.Timeout = 30 * time.Second