diff --git a/templates/definition/meter/solis-hybrid-s.yaml b/templates/definition/meter/solis-hybrid-s.yaml
index de58f121d..2da69b10d 100644
--- a/templates/definition/meter/solis-hybrid-s.yaml
+++ b/templates/definition/meter/solis-hybrid-s.yaml
@@ -13,13 +13,9 @@ capabilities: ["battery-control"]
 requirements:
   description:
     de: |
-      Um die aktive Ladesteuerung zum Netzladen nutzen zu können ist eine einmalige manuelle Einrichtung notwendig.
-      Navigiere zu "System Settings" > "Storage Mode" im Wechselrichter Menü und aktiviere "Allow grid charging".
-      Wenn die aktive Ladesteuerung dann die "Battery Reserve"-Einstellung anpasst, lädt der Wechselrichter die Batterie aus dem Netz bis zum hier konfigurierten Max SOC Wert auf (Standard: 95%).
+      Die aktive Batteriesteuerung überschreibt die Wechselrichter Einstellungen "Allow grid charging" und "Battery Reserve SOC".
     en: |
-      To use active battery control with grid charging, a one-time manual setup is required.
-      Navigate to "System Settings" > "Storage Mode" in the inverter menu and enable "Allow grid charging".
-      When active battery control adjusts the "Battery Reserve" setting, the inverter will charge the battery from the grid up to the Max SOC setting configured here (Default: 95%).
+      Active battery control overrides the inverter settings "Allow grid charging" and "Battery Reserve SOC".
 params:
   - name: usage
     choice: ["grid", "pv", "battery"]
@@ -145,12 +141,74 @@ render: |
       address: 33139 # Battery capacity SOC
       type: input
       decode: uint16
-  limitsoc:
-    source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      address: 43024 # Battery Reserve Mode SOC
-      type: writeholding
-      encoding: uint16
+  batterymode:
+    source: switch
+    switch:
+    - case: 1  # normal
+      set:
+        source: sequence
+        set:
+        - source: const
+          value: {{ .minsoc }}
+          set:
+            source: modbus
+            {{- include "modbus" . | indent 10 }}
+            register:
+              address: 43024 # Battery Reserve SOC
+              type: writeholding
+              decode: uint16
+        - source: const
+          value: 49 # Bits 0+4+5: Self Use Mode (1) + Battery Reserve (16) + Allow Grid Charge (32)
+          set:
+            source: modbus
+            {{- include "modbus" . | indent 10 }}
+            register:
+              address: 43110
+              type: writeholding
+              decode: uint16
+    - case: 2  # hold
+      set:
+        source: sequence
+        set:
+        - source: const
+          value: {{ .maxsoc }}
+          set:
+            source: modbus
+            {{- include "modbus" . | indent 10 }}
+            register:
+              address: 43024 # Battery Reserve SOC
+              type: writeholding
+              decode: uint16
+        - source: const
+          value: 17 # Bits 0+4: Self Use (1) + Battery Reserve (16)
+          set:
+            source: modbus
+            {{- include "modbus" . | indent 10 }}
+            register:
+              address: 43110
+              type: writeholding
+              decode: uint16
+    - case: 3  # charge
+      set:
+        source: sequence
+        set:
+        - source: const
+          value: {{ .maxsoc }}
+          set:
+            source: modbus
+            {{- include "modbus" . | indent 10 }}
+            register:
+              address: 43024 # Battery Reserve SOC
+              type: writeholding
+              decode: uint16
+        - source: const
+          value: 49 # Bits 0+4+5: Self Use Mode (1) + Battery Reserve (16) + Allow Grid Charge (32)
+          set:
+            source: modbus
+            {{- include "modbus" . | indent 10 }}
+            register:
+              address: 43110
+              type: writeholding
+              decode: uint16
   {{- include "battery-params" . }}
   {{- end }}