diff --git a/api/batterymode.go b/api/batterymode.go
index 4ca00b3f120..42855afdaff 100644
--- a/api/batterymode.go
+++ b/api/batterymode.go
@@ -7,6 +7,7 @@ type BatteryMode int
 const (
 	BatteryUnknown BatteryMode = iota
 	BatteryNormal
-	BatteryHold
+	BatteryHoldDischarge
 	BatteryCharge
+	BatteryHoldCharge
 )
diff --git a/api/batterymode_enumer.go b/api/batterymode_enumer.go
index 7fe4dbc6702..1093cee33ee 100644
--- a/api/batterymode_enumer.go
+++ b/api/batterymode_enumer.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 )
 
-const _BatteryModeName = "unknownnormalholdcharge"
+const _BatteryModeName = "unknownnormalholddischargechargeholdcharge"
 
-var _BatteryModeIndex = [...]uint8{0, 7, 13, 17, 23}
+var _BatteryModeIndex = [...]uint8{0, 7, 13, 26, 32, 42}
 
-const _BatteryModeLowerName = "unknownnormalholdcharge"
+const _BatteryModeLowerName = "unknownnormalholddischargechargeholdcharge"
 
 func (i BatteryMode) String() string {
 	if i < 0 || i >= BatteryMode(len(_BatteryModeIndex)-1) {
@@ -26,28 +26,32 @@ func _BatteryModeNoOp() {
 	var x [1]struct{}
 	_ = x[BatteryUnknown-(0)]
 	_ = x[BatteryNormal-(1)]
-	_ = x[BatteryHold-(2)]
+	_ = x[BatteryHoldDischarge-(2)]
 	_ = x[BatteryCharge-(3)]
+	_ = x[BatteryHoldCharge-(4)]
 }
 
-var _BatteryModeValues = []BatteryMode{BatteryUnknown, BatteryNormal, BatteryHold, BatteryCharge}
+var _BatteryModeValues = []BatteryMode{BatteryUnknown, BatteryNormal, BatteryHoldDischarge, BatteryCharge, BatteryHoldCharge}
 
 var _BatteryModeNameToValueMap = map[string]BatteryMode{
 	_BatteryModeName[0:7]:        BatteryUnknown,
 	_BatteryModeLowerName[0:7]:   BatteryUnknown,
 	_BatteryModeName[7:13]:       BatteryNormal,
 	_BatteryModeLowerName[7:13]:  BatteryNormal,
-	_BatteryModeName[13:17]:      BatteryHold,
-	_BatteryModeLowerName[13:17]: BatteryHold,
-	_BatteryModeName[17:23]:      BatteryCharge,
-	_BatteryModeLowerName[17:23]: BatteryCharge,
+	_BatteryModeName[13:26]:      BatteryHoldDischarge,
+	_BatteryModeLowerName[13:26]: BatteryHoldDischarge,
+	_BatteryModeName[26:32]:      BatteryCharge,
+	_BatteryModeLowerName[26:32]: BatteryCharge,
+	_BatteryModeName[32:42]:      BatteryHoldCharge,
+	_BatteryModeLowerName[32:42]: BatteryHoldCharge,
 }
 
 var _BatteryModeNames = []string{
 	_BatteryModeName[0:7],
 	_BatteryModeName[7:13],
-	_BatteryModeName[13:17],
-	_BatteryModeName[17:23],
+	_BatteryModeName[13:26],
+	_BatteryModeName[26:32],
+	_BatteryModeName[32:42],
 }
 
 // BatteryModeString retrieves an enum value from the enum constants string name.
diff --git a/assets/js/components/BottomTabs/Bar.vue b/assets/js/components/BottomTabs/Bar.vue
index aa88cd504ae..ecf958ae7d1 100644
--- a/assets/js/components/BottomTabs/Bar.vue
+++ b/assets/js/components/BottomTabs/Bar.vue
@@ -14,7 +14,7 @@
 					class="tab-icon"
 					:soc="batterySoc || 0"
 					:grid-charge="batteryGridChargeActive"
-					:hold="batteryHold"
+					:hold="batteryHoldDischarge"
 				/>
 			</Item>
 
@@ -85,8 +85,8 @@ export default defineComponent({
 		batterySoc() {
 			return this.battery?.soc;
 		},
-		batteryHold() {
-			return this.batteryMode === "hold";
+		batteryHoldDischarge() {
+			return this.batteryMode === "holddischarge";
 		},
 		batteryConfigured() {
 			return (this.battery?.devices?.length ?? 0) > 0;
diff --git a/assets/js/components/Energyflow/Energyflow.vue b/assets/js/components/Energyflow/Energyflow.vue
index 5dd1265dabe..75ad7b35ace 100644
--- a/assets/js/components/Energyflow/Energyflow.vue
+++ b/assets/js/components/Energyflow/Energyflow.vue
@@ -19,7 +19,7 @@
 				:batteryCharge="batteryCharge"
 				:batteryDischarge="batteryDischarge"
 				:batteryGridCharge="batteryGridChargeActive"
-				:batteryHold="batteryHold"
+				:batteryHoldDischarge="batteryHoldDischarge"
 				:pvProduction="pvProduction"
 				:homePower="homePower"
 				:batterySoc="batterySoc"
@@ -114,7 +114,7 @@
 								:power="batteryDischarge"
 								:powerUnit="powerUnit"
 								:iconProps="{
-									hold: batteryHold,
+									hold: batteryHoldDischarge,
 									soc: batterySoc,
 									gridCharge: batteryGridChargeActive,
 								}"
@@ -448,10 +448,12 @@ export default defineComponent({
 			return this.$t("main.energyflow.batteryCharge");
 		},
 		batteryDischargeLabel() {
-			return this.$t(`main.energyflow.battery${this.batteryHold ? "Hold" : "Discharge"}`);
+			return this.$t(
+				`main.energyflow.battery${this.batteryHoldDischarge ? "HoldDischarge" : "Discharge"}`
+			);
 		},
-		batteryHold() {
-			return this.batteryMode === "hold";
+		batteryHoldDischarge() {
+			return this.batteryMode === "holddischarge";
 		},
 		consumption() {
 			return this.homePower + this.batteryCharge + this.loadpointsPower;
diff --git a/assets/js/components/Energyflow/Visualization.vue b/assets/js/components/Energyflow/Visualization.vue
index f448fdbe55d..67a54e74b2f 100644
--- a/assets/js/components/Energyflow/Visualization.vue
+++ b/assets/js/components/Energyflow/Visualization.vue
@@ -102,7 +102,11 @@
 			</div>
 			<div class="label-scale-name">Out</div>
 		</div>
-		<BatteryIcon hold class="battery-hold" :class="{ 'battery-hold--active': batteryHold }" />
+		<BatteryIcon
+			hold
+			class="battery-hold"
+			:class="{ 'battery-hold--active': batteryHoldDischarge }"
+		/>
 	</div>
 </template>
 
@@ -131,7 +135,7 @@ export default defineComponent({
 		batterySoc: { type: Number },
 		batteryCharge: { type: Number, default: 0 },
 		batteryDischarge: { type: Number, default: 0 },
-		batteryHold: { type: Boolean, default: false },
+		batteryHoldDischarge: { type: Boolean, default: false },
 		batteryGridCharge: { type: Boolean, default: false },
 		pvProduction: { type: Number, default: 0 },
 		homePower: { type: Number, default: 0 },
diff --git a/assets/js/components/Loadpoints/BatteryBoostButton.vue b/assets/js/components/Loadpoints/BatteryBoostButton.vue
index ffc29cf0344..71d0db74b53 100644
--- a/assets/js/components/Loadpoints/BatteryBoostButton.vue
+++ b/assets/js/components/Loadpoints/BatteryBoostButton.vue
@@ -2,7 +2,7 @@
 	<button
 		class="root position-relative"
 		tabindex="0"
-		:class="{ active, belowLimit, batteryHold, full }"
+		:class="{ active, belowLimit, batteryHoldDischarge, full }"
 		:style="{ '--soc': `${adjustedSoc}%` }"
 		:disabled="disabled"
 		:aria-label="ariaLabel"
@@ -67,11 +67,11 @@ export default defineComponent({
 		belowLimit(): boolean {
 			return this.batterySoc < this.batteryBoostLimit;
 		},
-		batteryHold(): boolean {
-			return this.batteryMode === BATTERY_MODE.HOLD;
+		batteryHoldDischarge(): boolean {
+			return this.batteryMode === BATTERY_MODE.HOLD_DISCHARGE;
 		},
 		available(): boolean {
-			return !this.belowLimit && !this.batteryHold;
+			return !this.belowLimit && !this.batteryHoldDischarge;
 		},
 		iconStyle() {
 			return {
@@ -83,7 +83,7 @@ export default defineComponent({
 		},
 		ariaLabel(): string {
 			const t = (key: string) => this.$t(`main.loadpointSettings.batteryBoost.${key}`);
-			if (this.batteryHold) return t("stateHold");
+			if (this.batteryHoldDischarge) return t("stateHold");
 			if (this.active) return t("stateActive");
 			if (this.belowLimit) return t("stateBelowLimit");
 			return t("stateReady");
@@ -114,7 +114,7 @@ export default defineComponent({
 			const newValue = !this.active;
 
 			// battery hold: only show message, don't toggle
-			if (newValue && this.batteryHold) {
+			if (newValue && this.batteryHoldDischarge) {
 				status("batteryBoostHold");
 				return;
 			}
@@ -172,7 +172,7 @@ export default defineComponent({
 	opacity: 0.25;
 }
 .root.belowLimit:not(:disabled),
-.root.batteryHold:not(:disabled) {
+.root.batteryHoldDischarge:not(:disabled) {
 	opacity: 0.5;
 }
 .root:before,
diff --git a/assets/js/types/evcc.ts b/assets/js/types/evcc.ts
index c5cbdc15688..a0bcedd1ec7 100644
--- a/assets/js/types/evcc.ts
+++ b/assets/js/types/evcc.ts
@@ -411,8 +411,9 @@ export enum CHARGE_MODE {
 export enum BATTERY_MODE {
   UNKNOWN = "unknown",
   NORMAL = "normal",
-  HOLD = "hold",
+  HOLD_DISCHARGE = "holddischarge",
   CHARGE = "charge",
+  HOLD_CHARGE = "holdcharge",
 }
 
 export enum PHASES {
diff --git a/cmd/flags.go b/cmd/flags.go
index c3e49f990da..845131b869e 100644
--- a/cmd/flags.go
+++ b/cmd/flags.go
@@ -29,7 +29,7 @@ const (
 	flagCustomCssDescription = "Additional user-defined CSS file for custom styling. No compatibility guarantees."
 
 	flagBatteryMode                = "battery-mode"
-	flagBatteryModeDescription     = "Set battery mode (normal, hold, charge)"
+	flagBatteryModeDescription     = "Set battery mode (normal, holddischarge, holdcharge, charge)"
 	flagBatteryModeWait            = "battery-mode-wait"
 	flagBatteryModeWaitDescription = "Wait given duration during which potential watchdogs are active"
 
diff --git a/core/site_battery.go b/core/site_battery.go
index a052bc74ccc..bd3c0746348 100644
--- a/core/site_battery.go
+++ b/core/site_battery.go
@@ -59,7 +59,7 @@ func (site *Site) updateBatteryMode(batteryGridChargeActive bool, rate api.Rate)
 	fromToCharge := batteryMode == api.BatteryCharge || batteryMode == api.BatteryUnknown && site.batteryMode == api.BatteryCharge
 	if dimmed := circuitDimmed(site.circuit); fromToCharge && dimmed != nil && *dimmed {
 		site.log.DEBUG.Println("battery mode: circuit dimmed")
-		batteryMode = api.BatteryHold
+		batteryMode = api.BatteryHoldDischarge
 	}
 
 	// NOTE: applyBatteryMode is always called when charge mode is active to validate max soc
@@ -105,7 +105,7 @@ func (site *Site) requiredBatteryMode(batteryGridChargeActive bool, rate api.Rat
 	case batteryGridChargeActive:
 		res = keepUnlessModified(api.BatteryCharge)
 	case site.dischargeControlActive(rate):
-		res = keepUnlessModified(api.BatteryHold)
+		res = keepUnlessModified(api.BatteryHoldDischarge)
 	case batteryModeModified(batMode):
 		res = api.BatteryNormal
 	}
@@ -158,7 +158,7 @@ func (site *Site) applyBatteryMode(mode api.BatteryMode) error {
 		}
 
 		// validate max soc
-		if fromToCharge && mode != api.BatteryHold {
+		if fromToCharge && mode != api.BatteryHoldDischarge {
 			ok, err := site.batteryMaxSocReached(dev)
 			if err != nil && !errors.Is(err, api.ErrNotAvailable) {
 				return err
@@ -167,7 +167,7 @@ func (site *Site) applyBatteryMode(mode api.BatteryMode) error {
 			// put battery into hold mode when soc limit reached
 			if ok {
 				// TODO do this only once
-				mode = api.BatteryHold
+				mode = api.BatteryHoldDischarge
 			}
 		}
 
diff --git a/core/site_battery_test.go b/core/site_battery_test.go
index 30860b7f940..7f46b890b66 100644
--- a/core/site_battery_test.go
+++ b/core/site_battery_test.go
@@ -17,7 +17,7 @@ func TestApplyBatteryMode(t *testing.T) {
 	}{
 		{api.BatteryUnknown, api.BatteryUnknown}, // no change required
 		{api.BatteryNormal, api.BatteryUnknown},  // no change required
-		{api.BatteryHold, api.BatteryNormal},
+		{api.BatteryHoldDischarge, api.BatteryNormal},
 		{api.BatteryCharge, api.BatteryNormal},
 	} {
 		t.Logf("%+v", tc)
@@ -97,9 +97,9 @@ func TestExternalBatteryModeChange(t *testing.T) {
 		{api.BatteryNormal, api.BatteryNormal, api.BatteryUnknown},
 		{api.BatteryNormal, api.BatteryCharge, api.BatteryCharge},
 
-		{api.BatteryHold, api.BatteryUnknown, api.BatteryNormal}, // return to normal
-		{api.BatteryHold, api.BatteryNormal, api.BatteryNormal},
-		{api.BatteryHold, api.BatteryHold, api.BatteryUnknown},
+		{api.BatteryHoldDischarge, api.BatteryUnknown, api.BatteryNormal}, // return to normal
+		{api.BatteryHoldDischarge, api.BatteryNormal, api.BatteryNormal},
+		{api.BatteryHoldDischarge, api.BatteryHoldDischarge, api.BatteryUnknown},
 
 		{api.BatteryCharge, api.BatteryUnknown, api.BatteryNormal}, // return to normal
 		{api.BatteryCharge, api.BatteryNormal, api.BatteryNormal},
@@ -172,16 +172,16 @@ func TestForcedBatteryChargeLimits(t *testing.T) {
 		soc                float64
 	}{
 		{api.BatteryUnknown, api.BatteryCharge, 50},
-		{api.BatteryUnknown, api.BatteryHold, 90},
+		{api.BatteryUnknown, api.BatteryHoldDischarge, 90},
 
 		{api.BatteryNormal, api.BatteryCharge, 50},
-		{api.BatteryNormal, api.BatteryHold, 90},
+		{api.BatteryNormal, api.BatteryHoldDischarge, 90},
 
-		{api.BatteryHold, api.BatteryCharge, 50},
-		{api.BatteryHold, api.BatteryHold, 90}, // TODO make this api.BatteryUnknown
+		{api.BatteryHoldDischarge, api.BatteryCharge, 50},
+		{api.BatteryHoldDischarge, api.BatteryHoldDischarge, 90}, // TODO make this api.BatteryUnknown
 
 		{api.BatteryCharge, api.BatteryUnknown, 50},
-		{api.BatteryCharge, api.BatteryHold, 90},
+		{api.BatteryCharge, api.BatteryHoldDischarge, 90},
 	} {
 		t.Logf("%+v", tc)
 
diff --git a/core/site_test.go b/core/site_test.go
index a1ad329038b..508e85c7e6f 100644
--- a/core/site_test.go
+++ b/core/site_test.go
@@ -131,12 +131,12 @@ func TestRequiredBatteryMode(t *testing.T) {
 	}{
 		{false, api.BatteryUnknown, api.BatteryUnknown}, // ignore
 		{false, api.BatteryNormal, api.BatteryUnknown},  // ignore
-		{false, api.BatteryHold, api.BatteryNormal},
+		{false, api.BatteryHoldDischarge, api.BatteryNormal},
 		{false, api.BatteryCharge, api.BatteryNormal},
 
 		{true, api.BatteryUnknown, api.BatteryCharge},
 		{true, api.BatteryNormal, api.BatteryCharge},
-		{true, api.BatteryHold, api.BatteryCharge},
+		{true, api.BatteryHoldDischarge, api.BatteryCharge},
 		{true, api.BatteryCharge, api.BatteryUnknown}, // ignore
 	}
 
diff --git a/i18n/bg.json b/i18n/bg.json
index 3b32f5ef79e..0a562de5597 100644
--- a/i18n/bg.json
+++ b/i18n/bg.json
@@ -898,7 +898,7 @@
       "batteryDischarge": "Разреждане на батерията",
       "batteryGridChargeActive": "зареждането от мрежата е актижно",
       "batteryGridChargeLimit": "зареждане от мрежата, когато",
-      "batteryHold": "Батерия (заключена)",
+      "batteryHoldDischarge": "Батерия (заключена)",
       "batteryTooltip": "{energy} от {total} ({soc})",
       "forecastTooltip": "прогноза: оставаща фотоволтаична продукция за днес",
       "gridImport": "Използвана енергия от мрежата",
diff --git a/i18n/cs.json b/i18n/cs.json
index e88da1be45b..fc316322488 100644
--- a/i18n/cs.json
+++ b/i18n/cs.json
@@ -1172,7 +1172,7 @@
       "batteryForecastNextLow": "Příští nízká",
       "batteryGridChargeActive": "nabíjení domácí baterie ze sítě je aktivní",
       "batteryGridChargeLimit": "nabíjení ze sítě, když",
-      "batteryHold": "Baterie (udržování stavu nabití)",
+      "batteryHoldDischarge": "Baterie (udržování stavu nabití)",
       "batteryTooltip": "{energy} z {total} ({soc})",
       "forecast": "Předpověď",
       "forecastTooltip": "předpověď: zbývající solární výroba dnes",
diff --git a/i18n/da.json b/i18n/da.json
index 0b21b7666ae..410d62fdc43 100644
--- a/i18n/da.json
+++ b/i18n/da.json
@@ -1174,7 +1174,7 @@
       "batteryForecastNextLow": "Næste lavpunkt",
       "batteryGridChargeActive": "Opladning fra elnettet: aktiv",
       "batteryGridChargeLimit": "Opladning fra elnettet: når",
-      "batteryHold": "Batteri (låst)",
+      "batteryHoldDischarge": "Batteri (låst)",
       "batteryTooltip": "{energy} af {total} ({soc})",
       "forecast": "Prognose",
       "forecastTooltip": "prognose: resterende solenergi produktion i dag",
diff --git a/i18n/de.json b/i18n/de.json
index da04eae7c59..18315bbeced 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -1162,7 +1162,7 @@
       "batteryForecastNextLow": "Tief",
       "batteryGridChargeActive": "Netzladen: aktiv",
       "batteryGridChargeLimit": "Netzladen: wenn",
-      "batteryHold": "Batterie (gesperrt)",
+      "batteryHoldDischarge": "Batterie (gesperrt)",
       "batteryTooltip": "{energy} von {total} ({soc})",
       "forecast": "Vorhersage",
       "forecastTooltip": "Vorhersage: verbleibende PV-Produktion heute",
diff --git a/i18n/el.json b/i18n/el.json
index d2bdde3720d..346f870bd89 100644
--- a/i18n/el.json
+++ b/i18n/el.json
@@ -903,7 +903,7 @@
       "batteryDischarge": "Αποφόρτιση μπαταρίας",
       "batteryGridChargeActive": "ενεργή φόρτιση από το δίκτυο",
       "batteryGridChargeLimit": "φόρτιση από το δίκτυο όταν",
-      "batteryHold": "Μπαταρία (κλειδωμένο)",
+      "batteryHoldDischarge": "Μπαταρία (κλειδωμένο)",
       "batteryTooltip": "{energy} από {total} ({soc})",
       "forecastTooltip": "πρόβλεψη: εναπομένουσα ηλιακή παραγωγή σήμερα",
       "gridImport": "Χρήση δικτύου",
diff --git a/i18n/en.json b/i18n/en.json
index a153c0775ea..122dd32dd65 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1162,7 +1162,7 @@
       "batteryForecastNextLow": "Low",
       "batteryGridChargeActive": "Grid charging: active",
       "batteryGridChargeLimit": "Grid charging: when",
-      "batteryHold": "Battery (locked)",
+      "batteryHoldDischarge": "Battery (locked)",
       "batteryTooltip": "{energy} of {total} ({soc})",
       "forecast": "Forecast",
       "forecastTooltip": "forecast: remaining solar production today",
diff --git a/i18n/es.json b/i18n/es.json
index 902f473b58c..ba13bae950e 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -915,7 +915,7 @@
       "batteryDischarge": "Descargar la batería",
       "batteryGridChargeActive": "carga de red activa",
       "batteryGridChargeLimit": "carga de la red cuando",
-      "batteryHold": "Batería (bloqueada)",
+      "batteryHoldDischarge": "Batería (bloqueada)",
       "batteryTooltip": "{energy} de {total} ({soc})",
       "forecastTooltip": "Previsión: producción solar restante para hoy",
       "gridImport": "Consumo de red",
diff --git a/i18n/fi.json b/i18n/fi.json
index 4c3f0245f53..6574853d95b 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -1170,7 +1170,7 @@
       "batteryForecastFull": "varaus täynnä {time}",
       "batteryGridChargeActive": "Ladataan verkosta",
       "batteryGridChargeLimit": "Milloin ladataan verkosta",
-      "batteryHold": "Akku (lukittu)",
+      "batteryHoldDischarge": "Akku (lukittu)",
       "batteryTooltip": "{energy} / {total} ({soc})",
       "forecast": "Ennuste",
       "forecastTooltip": "ennuste: jäljellä oleva aurinkotuotanto tänään",
diff --git a/i18n/fr.json b/i18n/fr.json
index 336ed8440bf..aee6242e932 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1173,7 +1173,7 @@
       "batteryForecastNextLow": "Prochain creux",
       "batteryGridChargeActive": "Charge réseau : active",
       "batteryGridChargeLimit": "Charge réseau : quand",
-      "batteryHold": "Batterie (verrouillée)",
+      "batteryHoldDischarge": "Batterie (verrouillée)",
       "batteryTooltip": "{energy} sur {total} ({soc})",
       "forecast": "Prévisions",
       "forecastTooltip": "prévision : production solaire restante aujourd’hui",
diff --git a/i18n/hr.json b/i18n/hr.json
index f8c6dbc89cc..766f28ada49 100644
--- a/i18n/hr.json
+++ b/i18n/hr.json
@@ -904,7 +904,7 @@
       "batteryDischarge": "Pražnjenje baterije",
       "batteryGridChargeActive": "punjenje putem mreže je aktivno",
       "batteryGridChargeLimit": "punjene putem mreže kada",
-      "batteryHold": "Baterija (zaključano)",
+      "batteryHoldDischarge": "Baterija (zaključano)",
       "batteryTooltip": "{energy} od {total} ({soc})",
       "forecastTooltip": "predviđanje: današnja preostala solarna proizvodnja",
       "gridImport": "Korištenje mreže",
diff --git a/i18n/hu.json b/i18n/hu.json
index 90f1ac97a07..5fb30f01694 100644
--- a/i18n/hu.json
+++ b/i18n/hu.json
@@ -914,7 +914,7 @@
       "batteryDischarge": "Energiatároló kisütés",
       "batteryGridChargeActive": "hálózatból töltés aktív",
       "batteryGridChargeLimit": "hálózatból töltés ha",
-      "batteryHold": "Energiatároló (lezárva)",
+      "batteryHoldDischarge": "Energiatároló (lezárva)",
       "batteryTooltip": "{energy} / {total} ({soc})",
       "forecastTooltip": "előrejelzés: ma fennmaradó napenergia-termelés",
       "gridImport": "Hálózatból import",
diff --git a/i18n/it.json b/i18n/it.json
index d46db698f42..c0081984ed4 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -1148,7 +1148,7 @@
       "batteryForecastFull": "full {time}",
       "batteryGridChargeActive": "Ricarica dalla rete: attiva",
       "batteryGridChargeLimit": "Ricarica dalla rete: quando",
-      "batteryHold": "Batteria (locked)",
+      "batteryHoldDischarge": "Batteria (locked)",
       "batteryTooltip": "{energy} di {total} ({soc})",
       "forecast": "Previsioni",
       "forecastTooltip": "previsioni: produzione solare rimanente per oggi",
diff --git a/i18n/ja.json b/i18n/ja.json
index 14a22b00560..71ad71801a0 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -1178,7 +1178,7 @@
       "batteryForecastNextLow": "次の最低値",
       "batteryGridChargeActive": "系統充電: アクティブ",
       "batteryGridChargeLimit": "系統充電: 条件待ち",
-      "batteryHold": "蓄電池 (制限中)",
+      "batteryHoldDischarge": "蓄電池 (制限中)",
       "batteryTooltip": "{energy} / {total} ({soc})",
       "forecast": "予測",
       "forecastTooltip": "予測: 本日の残り太陽光発電量",
diff --git a/i18n/lb.json b/i18n/lb.json
index 57dbd48acdb..0842c1d4d07 100644
--- a/i18n/lb.json
+++ b/i18n/lb.json
@@ -1160,7 +1160,7 @@
       "batteryForecastFull": "voll {time}",
       "batteryGridChargeActive": "Oluede vum Netz: aktiv",
       "batteryGridChargeLimit": "Opluede vum Netz: wann",
-      "batteryHold": "Batterie (gespäert)",
+      "batteryHoldDischarge": "Batterie (gespäert)",
       "batteryTooltip": "{energy} vun {total} ({soc})",
       "forecast": "Viraussoen",
       "forecastTooltip": "Prognose: Rescht Solarproduktioun fir haut",
diff --git a/i18n/lt.json b/i18n/lt.json
index da1aa4dc54a..c158f345b1a 100644
--- a/i18n/lt.json
+++ b/i18n/lt.json
@@ -1178,7 +1178,7 @@
       "batteryForecastNextLow": "Sekanti žema",
       "batteryGridChargeActive": "Įkrovimas iš tinklo: aktyvus",
       "batteryGridChargeLimit": "Įkrauti iš tinklo: kai",
-      "batteryHold": "Kaupiklis (užblokuotas)",
+      "batteryHoldDischarge": "Kaupiklis (užblokuotas)",
       "batteryTooltip": "{energy} iš {total} ({soc})",
       "forecast": "Prognozė",
       "forecastTooltip": "prognozė: likusi saulės energijos gamyba šiandien",
diff --git a/i18n/nl.json b/i18n/nl.json
index 53144babdee..2e268e30584 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -1169,7 +1169,7 @@
       "batteryForecastFull": "Vol om {time}",
       "batteryGridChargeActive": "Net laden: actief",
       "batteryGridChargeLimit": "Net laden: wanneer",
-      "batteryHold": "Batterij (geblokkeerd)",
+      "batteryHoldDischarge": "Batterij (geblokkeerd)",
       "batteryTooltip": "{energy} van {total} ({soc})",
       "forecast": "Voorspelling",
       "forecastTooltip": "voorspelling: resterende zonne-energieproductie voor vandaag",
diff --git a/i18n/no.json b/i18n/no.json
index 7ea840c44d4..e84fd90a9e2 100644
--- a/i18n/no.json
+++ b/i18n/no.json
@@ -931,7 +931,7 @@
       "batteryDischarge": "Batteri utlading",
       "batteryGridChargeActive": "nettlading aktiv",
       "batteryGridChargeLimit": "nettlading når",
-      "batteryHold": "Batteri (låst)",
+      "batteryHoldDischarge": "Batteri (låst)",
       "batteryTooltip": "{energy} av {total} ({soc})",
       "forecastTooltip": "prognose: gjenværende solenergiproduksjon i dag",
       "gridImport": "Lysnettimport",
diff --git a/i18n/pl.json b/i18n/pl.json
index 2f91f2a1d80..74faac5a38e 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -1069,7 +1069,7 @@
       "batteryForecastFull": "pełny {time}",
       "batteryGridChargeActive": "Ładowanie z sieci: aktywne",
       "batteryGridChargeLimit": "Ładowanie z sieci: gdy",
-      "batteryHold": "Magazyn energii (chroniony)",
+      "batteryHoldDischarge": "Magazyn energii (chroniony)",
       "batteryTooltip": "{energy} z {total} ({soc})",
       "forecast": "Prognoza",
       "forecastTooltip": "prognoza: pozostała na dziś produkcja energii słonecznej",
diff --git a/i18n/pt.json b/i18n/pt.json
index 4c1f4480234..aae3690f7cf 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -1160,7 +1160,7 @@
       "batteryForecastFull": "cheio {time}",
       "batteryGridChargeActive": "Carga da rede: ativa",
       "batteryGridChargeLimit": "Carga da rede: quando",
-      "batteryHold": "Bateria (suspensa)",
+      "batteryHoldDischarge": "Bateria (suspensa)",
       "batteryTooltip": "{energy} de {total} ({soc})",
       "forecast": "Previsões",
       "forecastTooltip": "previsão: produção solar restante de hoje",
diff --git a/i18n/ro.json b/i18n/ro.json
index cb0becba657..84cb1fdfc50 100644
--- a/i18n/ro.json
+++ b/i18n/ro.json
@@ -1063,7 +1063,7 @@
       "batteryForecastFull": "plin {time}",
       "batteryGridChargeActive": "Încărcare din rețea: activă",
       "batteryGridChargeLimit": "Încărcare din rețea: când",
-      "batteryHold": "Baterie (inchisa)",
+      "batteryHoldDischarge": "Baterie (inchisa)",
       "batteryTooltip": "{energy} din {total} ({soc})",
       "forecast": "Prognoză",
       "forecastTooltip": "prognoză: producția solară rămasă astăzi",
diff --git a/i18n/ru.json b/i18n/ru.json
index ebffd384a87..477f6d43a02 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -894,7 +894,7 @@
       "batteryDischarge": "Батарея разряжается",
       "batteryGridChargeActive": "сетевая зарядка активна",
       "batteryGridChargeLimit": "зарядка сети при",
-      "batteryHold": "Батарея (заблокирована)",
+      "batteryHoldDischarge": "Батарея (заблокирована)",
       "batteryTooltip": "{energy} из {total} ({soc})",
       "forecastTooltip": "прогноз: оставшееся производство солнечной энергии на сегодня",
       "gridImport": "Потребление из сети",
diff --git a/i18n/sl.json b/i18n/sl.json
index c557f05c2b3..6bdc1d65ef2 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -925,7 +925,7 @@
       "batteryDischarge": "Praznjenje baterije",
       "batteryGridChargeActive": "polnjenje iz omrežja aktivno",
       "batteryGridChargeLimit": "polnjenje iz omrežja ko",
-      "batteryHold": "Baterija (zaklenjena)",
+      "batteryHoldDischarge": "Baterija (zaklenjena)",
       "batteryTooltip": "{energy} od {total} ({soc})",
       "forecastTooltip": "napoved: preostala sončna proizvodnja danes",
       "gridImport": "Uvoz iz omrežja",
diff --git a/i18n/sv.json b/i18n/sv.json
index 06df34a1a3e..d361317db90 100644
--- a/i18n/sv.json
+++ b/i18n/sv.json
@@ -1179,7 +1179,7 @@
       "batteryForecastNextLow": "Nästa lågpunkt",
       "batteryGridChargeActive": "Nätladdning: aktiv",
       "batteryGridChargeLimit": "Nätladdning: när",
-      "batteryHold": "Batteri (låst)",
+      "batteryHoldDischarge": "Batteri (låst)",
       "batteryTooltip": "{energy} av {total} ({soc})",
       "forecast": "Prognos",
       "forecastTooltip": "Prognos: återstående solproduktion idag",
diff --git a/i18n/ta.json b/i18n/ta.json
index e450689f8ac..283e91cdc31 100644
--- a/i18n/ta.json
+++ b/i18n/ta.json
@@ -981,7 +981,7 @@
       "batteryForecastFull": "முழு {time}",
       "batteryGridChargeActive": "கிரிட் சார்சிங்: செயலில் உள்ளது",
       "batteryGridChargeLimit": "கிரிட் சார்சிங்: எப்போது",
-      "batteryHold": "மின்கலம் (பூட்டபட்டது)",
+      "batteryHoldDischarge": "மின்கலம் (பூட்டபட்டது)",
       "batteryTooltip": "{energy} ({total}) இன் {soc}",
       "forecast": "முன்னறிவிப்பு",
       "forecastTooltip": "முன்னறிவிப்பு: இன்று சூரிய விளைவாக்கம்",
diff --git a/i18n/tr.json b/i18n/tr.json
index 73fb2711b1b..aba6a8ae963 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -1109,7 +1109,7 @@
       "batteryForecastFull": "dolu {time}",
       "batteryGridChargeActive": "Şebekeden doldurma: etkin",
       "batteryGridChargeLimit": "Şebekeden doldurma: şayet",
-      "batteryHold": "Batarya (kilitli)",
+      "batteryHoldDischarge": "Batarya (kilitli)",
       "batteryTooltip": "{total} ({soc})'ın {energy}'ı",
       "forecast": "Tahmin",
       "forecastTooltip": "“öngörü: bugün kalan güneşden üreti̇m”",
diff --git a/i18n/uk.json b/i18n/uk.json
index f8abd66fa1e..0fe5d599790 100644
--- a/i18n/uk.json
+++ b/i18n/uk.json
@@ -907,7 +907,7 @@
       "batteryDischarge": "Розрядження батареї",
       "batteryGridChargeActive": "активна зарядка мережі",
       "batteryGridChargeLimit": "зарядка мережі коли",
-      "batteryHold": "Акумулятор (locked)",
+      "batteryHoldDischarge": "Акумулятор (locked)",
       "batteryTooltip": "{energy} із {total} ({soc})",
       "forecastTooltip": "Прогноз: залишкове виробництво сонячної енергії сьогодні",
       "gridImport": "Використання мережі",
diff --git a/i18n/zh-Hans.json b/i18n/zh-Hans.json
index 62f4151cf62..841b273a0fc 100644
--- a/i18n/zh-Hans.json
+++ b/i18n/zh-Hans.json
@@ -646,7 +646,7 @@
       "batteryDischarge": "电池放电中",
       "batteryGridChargeActive": "电网充电已激活",
       "batteryGridChargeLimit": "电网充电条件",
-      "batteryHold": "电池（已锁定）",
+      "batteryHoldDischarge": "电池（已锁定）",
       "batteryTooltip": "{energy} / {total} ({soc})",
       "forecastTooltip": "预测：今日剩余太阳能发电量",
       "gridImport": "电网用电",
diff --git a/meter/e3dc.go b/meter/e3dc.go
index b17fa1ac8a2..faccc84c4ea 100644
--- a/meter/e3dc.go
+++ b/meter/e3dc.go
@@ -215,7 +215,7 @@ func (m *E3dc) setBatteryMode(mode api.BatteryMode) error {
 			e3dcDischargeBatteryLimit(false, 0),
 			e3dcBatteryCharge(0),
 		}
-	case api.BatteryHold:
+	case api.BatteryHoldDischarge:
 		messages = []rscp.Message{
 			e3dcDischargeBatteryLimit(true, m.dischargeLimit),
 			e3dcBatteryCharge(0),
@@ -225,6 +225,11 @@ func (m *E3dc) setBatteryMode(mode api.BatteryMode) error {
 			e3dcDischargeBatteryLimit(false, 0),
 			e3dcBatteryCharge(50000), // max. 50kWh
 		}
+	case api.BatteryHoldCharge:
+		messages = []rscp.Message{
+			e3dcDischargeBatteryLimit(false, 0),
+			e3dcBatteryCharge(0),
+		}
 	default:
 		return api.ErrNotAvailable
 	}
diff --git a/meter/homeassistant.go b/meter/homeassistant.go
index 8f42dad895c..df5aa352920 100644
--- a/meter/homeassistant.go
+++ b/meter/homeassistant.go
@@ -110,9 +110,9 @@ func NewHomeAssistantFromConfig(other map[string]any) (api.Meter, error) {
 				return nil, errors.New("modeNormal is required when modeHold or modeCharge is configured")
 			}
 			modes := map[api.BatteryMode]string{
-				api.BatteryNormal: cc.ModeNormal,
-				api.BatteryHold:   cc.ModeHold,
-				api.BatteryCharge: cc.ModeCharge,
+				api.BatteryNormal:        cc.ModeNormal,
+				api.BatteryHoldDischarge: cc.ModeHold,
+				api.BatteryCharge:        cc.ModeCharge,
 			}
 			for _, entity := range modes {
 				if entity != "" && !strings.HasPrefix(entity, "script.") {
diff --git a/meter/lgess.go b/meter/lgess.go
index 2052530f904..7b4cdaa742f 100644
--- a/meter/lgess.go
+++ b/meter/lgess.go
@@ -147,7 +147,7 @@ func (m *LgEss) batteryMode(batterySocLimits batterySocLimits) func(api.BatteryM
 			time.Sleep(10 * time.Second)
 			// now turn Battery discharge on
 			return m.conn.BatteryMode("on", int(batterySocLimits.MinSoc), true)
-		case api.BatteryHold:
+		case api.BatteryHoldDischarge:
 			soc, err := m.batterySoc()
 			if err != nil {
 				return err
diff --git a/meter/rct.go b/meter/rct.go
index 1b58a4c4145..6108f9a7e3e 100644
--- a/meter/rct.go
+++ b/meter/rct.go
@@ -188,7 +188,7 @@ func NewRCT(ctx context.Context, uri, usage string, batterySocLimits batterySocL
 					return m.conn.Write(rct.PowerMngBatteryPowerExternW, floatVal(0))
 				})
 
-			case api.BatteryHold:
+			case api.BatteryHoldDischarge:
 				eg.Go(func() error {
 					return m.conn.Write(rct.PowerMngSocStrategy, []byte{rct.SOCTargetInternal})
 				})
diff --git a/meter/usage_battery.go b/meter/usage_battery.go
index 9cf56337bc2..356e6624273 100644
--- a/meter/usage_battery.go
+++ b/meter/usage_battery.go
@@ -58,7 +58,7 @@ func (m *batterySocLimits) LimitController(socG func() (float64, error), limitSo
 		case api.BatteryNormal:
 			return limitSocS(m.MinSoc)
 
-		case api.BatteryHold:
+		case api.BatteryHoldDischarge:
 			soc, err := socG()
 			if err != nil {
 				return err
@@ -68,6 +68,9 @@ func (m *batterySocLimits) LimitController(socG func() (float64, error), limitSo
 		case api.BatteryCharge:
 			return limitSocS(m.MaxSoc)
 
+		case api.BatteryHoldCharge:
+			return limitSocS(m.MinSoc)
+
 		default:
 			return api.ErrNotAvailable
 		}
diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml
index 1bec978f086..becbeb590ae 100644
--- a/templates/definition/meter/fronius-gen24.yaml
+++ b/templates/definition/meter/fronius-gen24.yaml
@@ -248,5 +248,23 @@ render: |
             uri: {{ joinHostPort .host .port }}
             id: 1
             value: 124:0:OutWRte
+    - case: 4 # holdcharge
+      set:
+        source: sequence
+        set:
+        - source: const
+          value: 1
+          set:
+            source: sunspec
+            uri: {{ .host }}:{{ .port }}
+            id: 1
+            value: 124:0:StorCtl_Mod
+        - source: const
+          value: 0 # %
+          set:
+            source: sunspec
+            uri: {{ .host }}:{{ .port }}
+            id: 1
+            value: 124:0:InWRte
   {{- include "battery-params" . }}
   {{- end }}
diff --git a/templates/definition/meter/fronius-solarapi-v1.yaml b/templates/definition/meter/fronius-solarapi-v1.yaml
index d620889eb04..047ee8147b4 100644
--- a/templates/definition/meter/fronius-solarapi-v1.yaml
+++ b/templates/definition/meter/fronius-solarapi-v1.yaml
@@ -110,6 +110,10 @@ render: |
           body: '{"timeofuse":[]}'
         - source: error
           error: ErrNotAvailable
+    - case: 4 # holdcharge (not implemented)
+      set:
+        source: error
+        error: ErrNotAvailable
   {{- end }}
   {{- include "battery-params" . }}
   {{- end }}
diff --git a/templates/definition/meter/fronius-vertoplus.yaml b/templates/definition/meter/fronius-vertoplus.yaml
index b856539400c..f11a67e5161 100644
--- a/templates/definition/meter/fronius-vertoplus.yaml
+++ b/templates/definition/meter/fronius-vertoplus.yaml
@@ -244,5 +244,23 @@ render: |
             uri: {{ joinHostPort .host .port }}
             id: 1
             value: 124:0:OutWRte
+    - case: 4 # holdcharge
+      set:
+        source: sequence
+        set:
+        - source: const
+          value: 1
+          set:
+            source: sunspec
+            uri: {{ .host }}:{{ .port }}
+            id: 1
+            value: 124:0:StorCtl_Mod
+        - source: const
+          value: 0 # %
+          set:
+            source: sunspec
+            uri: {{ .host }}:{{ .port }}
+            id: 1
+            value: 124:0:InWRte
   {{- include "battery-params" . }}
   {{- end }}
diff --git a/templates/definition/meter/sunspec-inverter-control.yaml b/templates/definition/meter/sunspec-inverter-control.yaml
index a7d4f871730..3615b35e4e4 100644
--- a/templates/definition/meter/sunspec-inverter-control.yaml
+++ b/templates/definition/meter/sunspec-inverter-control.yaml
@@ -104,5 +104,27 @@ render: |
             source: sunspec
             {{- include "modbus" . | indent 10 }}
             value: 124:0:InOutWRte_RvrtTms
+    - case: 4 # holdcharge
+      set:
+        source: sequence
+        set:
+        - source: const
+          value: 1
+          set:
+            source: sunspec
+            {{- include "modbus" . | indent 10 }}
+            value: 124:0:StorCtl_Mod
+        - source: const
+          value: 0 # %
+          set:
+            source: sunspec
+            {{- include "modbus" . | indent 10 }}
+            value: 124:0:InWRte
+        - source: const
+          value: 0 # s
+          set:
+            source: sunspec
+            {{- include "modbus" . | indent 10 }}
+            value: 124:0:InOutWRte_RvrtTms
   {{- include "battery-params" . }}
   {{- end }}