diff --git a/esphome/waterproxy.yaml b/esphome/waterproxy.yaml
index 5067f03..552c5b1 100644
--- a/esphome/waterproxy.yaml
+++ b/esphome/waterproxy.yaml
@@ -32,4 +32,6 @@
   icon: "mdi:water"
   total:
     name: "Water Total"
-    unit_of_measurement: "l"
+    unit_of_measurement: "L"
+    device_class: water
+    state_class: total_increasing
diff --git a/esphome/wavin9000.yaml b/esphome/wavin9000.yaml
index c84b2ba..ad1fe99 100644
--- a/esphome/wavin9000.yaml
+++ b/esphome/wavin9000.yaml
@@ -105,7 +105,7 @@
   channel_05: "0x04"
 #  channel_06: "0x05"
   channel_07: "0x06"
-  channel_08: "0x06"
+  channel_08: "0x07"
   channel_09: "0x08"
   channel_10: "0x09"
   channel_11: "0x0A"