python-kasa
diff --git a/‎kasa/smartdevice.py
Lines changed: 17 additions & 8 deletions b/‎kasa/smartdevice.py
Lines changed: 17 additions & 8 deletions
diff --git a/‎kasa/tests/test_readme_examples.py
Lines changed: 2 additions & 0 deletions b/‎kasa/tests/test_readme_examples.py
Lines changed: 2 additions & 0 deletions
@@ -281,8 +281,11 @@ async def _query_helper(
     @requires_update
     def has_emeter(self) -> bool:
         """Return True if device has an energy meter."""
-        sys_info = self.sys_info
-        features = sys_info["feature"].split(":")
+        return SmartDevice._has_emeter(self.sys_info)
+
+    @staticmethod
+    def _has_emeter(sys_info: Dict[str, Any]) -> bool:
+        features = sys_info.get("feature", "").split(":")
         return "ENE" in features
 
     async def get_sys_info(self) -> Dict[str, Any]:
@@ -294,13 +297,19 @@ async def update(self):
 
         Needed for methods that are decorated with `requires_update`.
         """
-        req = {}
-        req.update(self._create_request("system", "get_sysinfo"))
+        update_response = {}
+        update_response.update(
+            await self.protocol.query(
+                self.host, self._create_request("system", "get_sysinfo")
+            )
+        )
+
+        if SmartDevice._has_emeter(update_response):
+            update_response.update(
+                await self.protocol.query(self.host, self._create_emeter_request())
+            )
 
-        # Check for emeter if we were never updated, or if the device has emeter
-        if self._last_update is None or self.has_emeter:
-            req.update(self._create_emeter_request())
-        self._last_update = await self.protocol.query(self.host, req)
+        self._last_update = update_response
         # TODO: keep accessible for tests
         self._sys_info = self._last_update["system"]["get_sysinfo"]
 
 
@@ -18,8 +18,10 @@ def test_bulb_examples(mocker):
 def test_smartdevice_examples(mocker):
     """Use HS110 for emeter examples."""
     p = get_device_for_file("HS110(EU)_1.0_real.json")
+    has_emeter = p.has_emeter
     mocker.patch("kasa.smartdevice.SmartDevice", return_value=p)
     mocker.patch("kasa.smartdevice.SmartDevice.update")
+    mocker.patch("kasa.smartdevice.SmartDevice._has_emeter", return_value=has_emeter)
     res = xdoctest.doctest_module("kasa.smartdevice", "all")
     assert not res["failed"]