diff --git a/gallery/src/pages/misc/entity-state.ts b/gallery/src/pages/misc/entity-state.ts
index 857e432a28..4c2194c95c 100644
--- a/gallery/src/pages/misc/entity-state.ts
+++ b/gallery/src/pages/misc/entity-state.ts
@@ -53,6 +53,7 @@ const SENSOR_DEVICE_CLASSES = [
   "volatile_organic_compounds_parts",
   "voltage",
   "volume",
+  "volume_flow_rate",
   "water",
   "weight",
   "wind_speed",
diff --git a/src/common/const.ts b/src/common/const.ts
index 6c3b4faa1f..48545d06aa 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -48,6 +48,7 @@ import {
   mdiMoleculeCo2,
   mdiPalette,
   mdiPh,
+  mdiPipe,
   mdiProgressClock,
   mdiRayVertex,
   mdiRemote,
@@ -191,6 +192,7 @@ export const FIXED_DEVICE_CLASS_ICONS = {
   volatile_organic_compounds_parts: mdiMolecule,
   voltage: mdiSineWave,
   volume: mdiCarCoolantLevel,
+  volume_flow_rate: mdiPipe,
   water: mdiWater,
   weight: mdiWeight,
   wind_speed: mdiWeatherWindy,
diff --git a/src/common/entity/get_states.ts b/src/common/entity/get_states.ts
index 456ce27bce..465d9c0c76 100644
--- a/src/common/entity/get_states.ts
+++ b/src/common/entity/get_states.ts
@@ -211,6 +211,7 @@ const FIXED_DOMAIN_ATTRIBUTE_STATES = {
       "volatile_organic_compounds",
       "volatile_organic_compounds_parts",
       "voltage",
+      "volume_flow_rate",
     ],
     state_class: ["measurement", "total", "total_increasing"],
   },