diff --git a/core/site_battery.go b/core/site_battery.go
index f98f58eb5..8b4895e2e 100644
--- a/core/site_battery.go
+++ b/core/site_battery.go
@@ -12,6 +12,10 @@ func batteryModeModified(mode api.BatteryMode) bool {
 	return mode != api.BatteryUnknown && mode != api.BatteryNormal
 }
 
+func (site *Site) batteryConfigured() bool {
+	return len(site.batteryMeters) > 0
+}
+
 // GetBatteryMode returns the battery mode
 func (site *Site) GetBatteryMode() api.BatteryMode {
 	site.RLock()
@@ -47,6 +51,8 @@ func (site *Site) requiredBatteryMode(batteryGridChargeActive bool, rate api.Rat
 	}
 
 	switch {
+	case !site.batteryConfigured():
+		res = api.BatteryUnknown
 	case batteryGridChargeActive:
 		res = mapper(api.BatteryCharge)
 	case site.dischargeControlActive(rate):