diff --git a/src/data/energy.ts b/src/data/energy.ts
index 6e1cb28796..8d203861b6 100644
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -453,3 +453,53 @@ export const getEnergySolarForecasts = (hass: HomeAssistant) =>
   hass.callWS<EnergySolarForecasts>({
     type: "energy/solar_forecast",
   });
+
+export const ENERGY_GAS_VOLUME_UNITS = ["m³", "ft³"];
+export const ENERGY_GAS_ENERGY_UNITS = ["kWh"];
+export const ENERGY_GAS_UNITS = [
+  ...ENERGY_GAS_VOLUME_UNITS,
+  ...ENERGY_GAS_ENERGY_UNITS,
+];
+
+export type EnergyGasUnit = "volume" | "energy";
+
+export const getEnergyGasUnitCategory = (
+  hass: HomeAssistant,
+  prefs: EnergyPreferences
+): EnergyGasUnit | undefined => {
+  for (const source of prefs.energy_sources) {
+    if (source.type !== "gas") {
+      continue;
+    }
+
+    const entity = hass.states[source.stat_energy_from];
+    if (entity) {
+      return ENERGY_GAS_VOLUME_UNITS.includes(
+        entity.attributes.unit_of_measurement!
+      )
+        ? "volume"
+        : "energy";
+    }
+  }
+  return undefined;
+};
+
+export const getEnergyGasUnit = (
+  hass: HomeAssistant,
+  prefs: EnergyPreferences
+): string | undefined => {
+  for (const source of prefs.energy_sources) {
+    if (source.type !== "gas") {
+      continue;
+    }
+
+    const entity = hass.states[source.stat_energy_from];
+    if (entity?.attributes.unit_of_measurement) {
+      // Wh is normalized to kWh by stats generation
+      return entity.attributes.unit_of_measurement === "Wh"
+        ? "kWh"
+        : entity.attributes.unit_of_measurement;
+    }
+  }
+  return undefined;
+};
diff --git a/src/panels/config/energy/components/ha-energy-gas-settings.ts b/src/panels/config/energy/components/ha-energy-gas-settings.ts
index 4b57b0ee3d..09f85ddcc5 100644
--- a/src/panels/config/energy/components/ha-energy-gas-settings.ts
+++ b/src/panels/config/energy/components/ha-energy-gas-settings.ts
@@ -11,6 +11,7 @@ import {
   GasSourceTypeEnergyPreference,
   EnergyPreferencesValidation,
   EnergyValidationIssue,
+  getEnergyGasUnitCategory,
 } from "../../../../data/energy";
 import {
   showConfirmationDialog,
@@ -109,6 +110,7 @@ export class EnergyGasSettings extends LitElement {
 
   private _addSource() {
     showEnergySettingsGasDialog(this, {
+      unit: getEnergyGasUnitCategory(this.hass, this.preferences),
       saveCallback: async (source) => {
         await this._savePreferences({
           ...this.preferences,
@@ -123,6 +125,7 @@ export class EnergyGasSettings extends LitElement {
       ev.currentTarget.closest(".row").source;
     showEnergySettingsGasDialog(this, {
       source: { ...origSource },
+      unit: getEnergyGasUnitCategory(this.hass, this.preferences),
       saveCallback: async (newSource) => {
         await this._savePreferences({
           ...this.preferences,
diff --git a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
index e711615c41..2f86a6c5b3 100644
--- a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
+++ b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
@@ -5,6 +5,9 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-dialog";
 import {
   emptyGasEnergyPreference,
+  ENERGY_GAS_ENERGY_UNITS,
+  ENERGY_GAS_UNITS,
+  ENERGY_GAS_VOLUME_UNITS,
   GasSourceTypeEnergyPreference,
 } from "../../../../data/energy";
 import { HassDialog } from "../../../../dialogs/make-dialog-manager";
@@ -18,8 +21,6 @@ import "../../../../components/ha-radio";
 import "../../../../components/ha-formfield";
 import type { HaRadio } from "../../../../components/ha-radio";
 
-const energyUnits = ["m³"];
-
 @customElement("dialog-energy-gas-settings")
 export class DialogEnergyGasSettings
   extends LitElement
@@ -77,9 +78,19 @@ export class DialogEnergyGasSettings
 
         <ha-statistic-picker
           .hass=${this.hass}
-          .includeUnitOfMeasurement=${energyUnits}
+          .includeUnitOfMeasurement=${this._params.unit === undefined
+            ? ENERGY_GAS_UNITS
+            : this._params.unit === "energy"
+            ? ENERGY_GAS_ENERGY_UNITS
+            : ENERGY_GAS_VOLUME_UNITS}
           .value=${this._source.stat_energy_from}
-          .label=${`Gas usage (m³)`}
+          .label=${`Gas usage (${
+            this._params.unit === undefined
+              ? "m³ or kWh"
+              : this._params.unit === "energy"
+              ? "kWh"
+              : "m³"
+          })`}
           entities-only
           @value-changed=${this._statisticChanged}
         ></ha-statistic-picker>
diff --git a/src/panels/config/energy/dialogs/show-dialogs-energy.ts b/src/panels/config/energy/dialogs/show-dialogs-energy.ts
index 28d6d79c62..6feb7e7078 100644
--- a/src/panels/config/energy/dialogs/show-dialogs-energy.ts
+++ b/src/panels/config/energy/dialogs/show-dialogs-energy.ts
@@ -2,6 +2,7 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import {
   BatterySourceTypeEnergyPreference,
   DeviceConsumptionEnergyPreference,
+  EnergyGasUnit,
   EnergyInfo,
   FlowFromGridSourceEnergyPreference,
   FlowToGridSourceEnergyPreference,
@@ -44,6 +45,7 @@ export interface EnergySettingsBatteryDialogParams {
 
 export interface EnergySettingsGasDialogParams {
   source?: GasSourceTypeEnergyPreference;
+  unit?: EnergyGasUnit;
   saveCallback: (source: GasSourceTypeEnergyPreference) => Promise<void>;
 }
 
diff --git a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
index 6990690623..126a933ad2 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
@@ -22,6 +22,7 @@ import {
   EnergyData,
   energySourcesByType,
   getEnergyDataCollection,
+  getEnergyGasUnit,
 } from "../../../../data/energy";
 import {
   calculateStatisticsSumGrowth,
@@ -309,7 +310,7 @@ class HuiEnergyDistrubutionCard
                         ${formatNumber(gasUsage || 0, this.hass.locale, {
                           maximumFractionDigits: 1,
                         })}
-                        m³
+                        ${getEnergyGasUnit(this.hass, prefs) || "m³"}
                       </div>
                       <svg width="80" height="30">
                         <path d="M40 0 v30" id="gas" />
diff --git a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
index 306b5c89fa..5428cece53 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
@@ -24,6 +24,7 @@ import { labDarken } from "../../../../common/color/lab";
 import {
   EnergyData,
   getEnergyDataCollection,
+  getEnergyGasUnit,
   GasSourceTypeEnergyPreference,
 } from "../../../../data/energy";
 import { computeStateName } from "../../../../common/entity/compute_state_name";
@@ -56,6 +57,8 @@ export class HuiEnergyGasGraphCard
 
   @state() private _end = endOfToday();
 
+  @state() private _unit?: string;
+
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       getEnergyDataCollection(this.hass, {
@@ -92,7 +95,8 @@ export class HuiEnergyGasGraphCard
             .options=${this._createOptions(
               this._start,
               this._end,
-              this.hass.locale
+              this.hass.locale,
+              this._unit
             )}
             chart-type="bar"
           ></ha-chart-base>
@@ -109,7 +113,12 @@ export class HuiEnergyGasGraphCard
   }
 
   private _createOptions = memoizeOne(
-    (start: Date, end: Date, locale: FrontendLocaleData): ChartOptions => {
+    (
+      start: Date,
+      end: Date,
+      locale: FrontendLocaleData,
+      unit?: string
+    ): ChartOptions => {
       const dayDifference = differenceInDays(end, start);
       return {
         parsing: false,
@@ -160,7 +169,7 @@ export class HuiEnergyGasGraphCard
             type: "linear",
             title: {
               display: true,
-              text: "m³",
+              text: unit,
             },
             ticks: {
               beginAtZero: true,
@@ -175,7 +184,7 @@ export class HuiEnergyGasGraphCard
                 `${context.dataset.label}: ${formatNumber(
                   context.parsed.y,
                   locale
-                )} m³`,
+                )} ${unit}`,
             },
           },
           filler: {
@@ -209,6 +218,8 @@ export class HuiEnergyGasGraphCard
         (source) => source.type === "gas"
       ) as GasSourceTypeEnergyPreference[];
 
+    this._unit = getEnergyGasUnit(this.hass, energyData.prefs) || "m³";
+
     const statisticsData = Object.values(energyData.stats);
     const datasets: ChartDataset<"bar">[] = [];
     let endTime: Date;
diff --git a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
index 46b4adf9c8..14ac805ad9 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
@@ -26,6 +26,7 @@ import {
   EnergyData,
   energySourcesByType,
   getEnergyDataCollection,
+  getEnergyGasUnit,
 } from "../../../../data/energy";
 import { calculateStatisticSumGrowth } from "../../../../data/history";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
@@ -116,6 +117,8 @@ export class HuiEnergySourcesTableCard
           flow.stat_cost || flow.entity_energy_price || flow.number_energy_price
       );
 
+    const gasUnit = getEnergyGasUnit(this.hass, this._data.prefs) || "";
+
     return html` <ha-card>
       ${this._config.title
         ? html`<h1 class="card-header">${this._config.title}</h1>`
@@ -445,6 +448,7 @@ export class HuiEnergySourcesTableCard
                     this._data!.stats[source.stat_energy_from]
                   ) || 0;
                 totalGas += energy;
+
                 const cost_stat =
                   source.stat_cost ||
                   this._data!.info.cost_sensors[source.stat_energy_from];
@@ -479,7 +483,7 @@ export class HuiEnergySourcesTableCard
                   <td
                     class="mdc-data-table__cell mdc-data-table__cell--numeric"
                   >
-                    ${formatNumber(energy, this.hass.locale)} m³
+                    ${formatNumber(energy, this.hass.locale)} ${gasUnit}
                   </td>
                   ${showCosts
                     ? html`<td
@@ -502,7 +506,7 @@ export class HuiEnergySourcesTableCard
                     <td
                       class="mdc-data-table__cell mdc-data-table__cell--numeric"
                     >
-                      ${formatNumber(totalGas, this.hass.locale)} m³
+                      ${formatNumber(totalGas, this.hass.locale)} ${gasUnit}
                     </td>
                     ${showCosts
                       ? html`<td