diff --git a/dbus-sdr/sensorcommands.cpp b/dbus-sdr/sensorcommands.cpp
index 72cf377..f3cd385 100644
--- a/dbus-sdr/sensorcommands.cpp
+++ b/dbus-sdr/sensorcommands.cpp
@@ -125,7 +125,8 @@
                  {"voltage", SensorUnits::volts},
                  {"current", SensorUnits::amps},
                  {"fan_tach", SensorUnits::rpm},
-                 {"power", SensorUnits::watts}}};
+                 {"power", SensorUnits::watts},
+                 {"energy", SensorUnits::joules}}};
 
 void registerSensorFunctions() __attribute__((constructor));
 
diff --git a/include/dbus-sdr/sdrutils.hpp b/include/dbus-sdr/sdrutils.hpp
index b78e226..a38673e 100644
--- a/include/dbus-sdr/sdrutils.hpp
+++ b/include/dbus-sdr/sdrutils.hpp
@@ -354,7 +354,9 @@
          {"watchdog", std::make_pair(SensorTypeCodes::watchdog2,
                                      SensorEventTypeCodes::sensorSpecified)},
          {"entity", std::make_pair(SensorTypeCodes::entity,
-                                   SensorEventTypeCodes::sensorSpecified)}}};
+                                   SensorEventTypeCodes::sensorSpecified)},
+         {"energy", std::make_pair(SensorTypeCodes::other,
+                                   SensorEventTypeCodes::threshold)}}};
 std::string getSensorTypeStringFromPath(const std::string& path);
 
 uint8_t getSensorTypeFromPath(const std::string& path);
diff --git a/include/dbus-sdr/storagecommands.hpp b/include/dbus-sdr/storagecommands.hpp
index 7b3046c..2ae9291 100644
--- a/include/dbus-sdr/storagecommands.hpp
+++ b/include/dbus-sdr/storagecommands.hpp
@@ -60,6 +60,7 @@
     volts = 0x4,
     amps = 0x5,
     watts = 0x6,
+    joules = 0x7,
     rpm = 0x12,
 };