diff --git a/kasa/smart/modules/energymodule.py b/kasa/smart/modules/energymodule.py
index 5782a23fd..0479de297 100644
--- a/kasa/smart/modules/energymodule.py
+++ b/kasa/smart/modules/energymodule.py
@@ -43,12 +43,12 @@ def __init__(self, device: "SmartDevice", module: str):
 
     def query(self) -> Dict:
         """Query to execute during the update cycle."""
-        return {
+        req = {
             "get_energy_usage": None,
-            # The current_power in get_energy_usage is more precise (mw vs. w),
-            # making this rather useless, but maybe there are version differences?
-            "get_current_power": None,
         }
+        if self.supported_version > 1:
+            req["get_current_power"] = None
+        return req
 
     @property
     def current_power(self):
@@ -58,7 +58,9 @@ def current_power(self):
     @property
     def energy(self):
         """Return get_energy_usage results."""
-        return self.data["get_energy_usage"]
+        if en := self.data.get("get_energy_usage"):
+            return en
+        return self.data
 
     @property
     def emeter_realtime(self):