diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index 0d737237db..21f1fbd1cd 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -116,14 +116,14 @@ const OVERRIDE_NUMBER_UNITS = {
 
 const OVERRIDE_SENSOR_UNITS = {
   distance: ["cm", "ft", "in", "km", "m", "mi", "mm", "yd"],
-  gas: ["ft³", "m³"],
+  gas: ["CCF", "ft³", "m³"],
   precipitation: ["cm", "in", "mm"],
   precipitation_intensity: ["in/d", "in/h", "mm/d", "mm/h"],
   pressure: ["hPa", "Pa", "kPa", "bar", "cbar", "mbar", "mmHg", "inHg", "psi"],
   speed: ["ft/s", "in/d", "in/h", "km/h", "kn", "m/s", "mm/d", "mm/h", "mph"],
   temperature: ["°C", "°F", "K"],
-  volume: ["fl. oz.", "ft³", "gal", "L", "mL", "m³"],
-  water: ["ft³", "gal", "L", "m³"],
+  volume: ["CCF", "fl. oz.", "ft³", "gal", "L", "mL", "m³"],
+  water: ["CCF", "ft³", "gal", "L", "m³"],
   weight: ["g", "kg", "lb", "mg", "oz", "st", "µg"],
   wind_speed: ["ft/s", "km/h", "kn", "mph", "m/s"],
 };