diff --git a/lib/HomeAssistantHelper/strings.h b/lib/HomeAssistantHelper/strings.h
index 8ac68da..da99954 100644
--- a/lib/HomeAssistantHelper/strings.h
+++ b/lib/HomeAssistantHelper/strings.h
@@ -38,6 +38,8 @@ const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_measurement";
 const char HA_UNIT_OF_MEASUREMENT_C[]           PROGMEM = "°C";
 const char HA_UNIT_OF_MEASUREMENT_F[]           PROGMEM = "°F";
 const char HA_UNIT_OF_MEASUREMENT_PERCENT[]     PROGMEM = "%";
+const char HA_UNIT_OF_MEASUREMENT_L_MIN[]       PROGMEM = "L/min";
+const char HA_UNIT_OF_MEASUREMENT_GAL_MIN[]     PROGMEM = "gal/min";
 const char HA_ICON[]                            PROGMEM = "icon";
 const char HA_MIN[]                             PROGMEM = "min";
 const char HA_MAX[]                             PROGMEM = "max";
diff --git a/src/HaHelper.h b/src/HaHelper.h
index 149ebb4..94c434c 100644
--- a/src/HaHelper.h
+++ b/src/HaHelper.h
@@ -59,10 +59,10 @@ public:
       case Sensors::Purpose::DHW_FLOW_RATE:
         doc[FPSTR(HA_DEVICE_CLASS)] = F("volume_flow_rate");
         if (unit == UnitSystem::METRIC) {
-          doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+          doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_L_MIN);
           
         } else if (unit == UnitSystem::IMPERIAL) {
-          doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+          doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_GAL_MIN);
         }
         break;