diff --git a/config/packages/sungrow.yaml b/config/packages/sungrow.yaml
index 8dbabef..e6f713e 100644
--- a/config/packages/sungrow.yaml
+++ b/config/packages/sungrow.yaml
@@ -274,6 +274,7 @@ automation:
       active_power_limit: 4999 # W
       active_power_buffer: 200 # W - how much below limit we want to sit
       battery_lower_limit: 50 # %
+      battery_upper_limit: 98 # % - above this, let the BMS choose the charge rate
       battery_capacity: 12.8 # kWh
 
       # Shorthands
@@ -281,7 +282,7 @@ automation:
       current_pv_power: "{{ states('sensor.inverter_pv_power') | int(default=0) }}"
       current_ems_mode: "{{ states('sensor.inverter_ems_mode_raw') | int(default=-1) }}"
       current_battery_mode: "{{ states('sensor.inverter_forced_battery_mode_raw') | int(default=0)  }}"
-      battery_level: "{{ states('sensor.inverter_battery_level') | float(default=0) }}"
+      battery_level: "{{ states('sensor.inverter_battery_level') | float(default=100) }}"
       forced_battery_power: "{{ states('sensor.inverter_battery_forced_charge_discharge_power') | int(default=0) }}"
       forecast_remaining: "{{ states('sensor.solcast_forecast_remaining_today') | float(default=0) }}"
 
@@ -301,10 +302,11 @@ automation:
       enough_in_day: >
         {{ 2.5 * kwh_until_full < forecast_remaining }}
       battery_high_enough: "{{ battery_level > battery_lower_limit }}"
+      battery_too_high: "{{ battery_level >= battery_upper_limit }}"
       sunsetting: >
         {{ now() + timedelta(hours = 1) > state_attr('sun.sun', 'next_setting') | as_datetime }}
       should_slow_battery: >
-        {{ not sunsetting and battery_high_enough and enough_in_day }}
+        {{ not sunsetting and battery_high_enough and enough_in_day and not battery_too_high }}
     action:
       # TODO: discharge battery if too high and PV has dropped while forecast remains high
       - choose:
@@ -320,7 +322,6 @@ automation:
               - service: script.inverter_force_battery_charge
           - conditions:
               - not:
-                  - "{{ should_slow_battery }}"
                   - "{{ is_self_consuming }}"
             sequence:
               - service: script.inverter_self_consumption
diff --git a/config/zigbee2mqtt/state.json b/config/zigbee2mqtt/state.json
index c6f0629..0ed0a9a 100644
--- a/config/zigbee2mqtt/state.json
+++ b/config/zigbee2mqtt/state.json
@@ -8,7 +8,7 @@
         "linkquality": 215
     },
     "0x00158d0008091c32": {
-        "contact": true,
+        "contact": false,
         "voltage": 2995,
         "battery": 41,
         "temperature": 19,
@@ -53,7 +53,7 @@
         "power_outage_count": 41
     },
     "0x5c0272fffee93bae": {
-        "occupancy": true,
+        "occupancy": false,
         "tamper": false,
         "battery_low": false,
         "linkquality": 255
@@ -67,11 +67,11 @@
         "linkquality": 191
     },
     "0xa4c138fda4db2c5e": {
-        "occupancy": true,
+        "occupancy": false,
         "battery": 100,
         "sensitivity": "high",
         "keep_time": "120",
-        "illuminance": 850,
+        "illuminance": 874,
         "linkquality": 127
     },
     "0x84b4dbfffe850fda": {