diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py
index 50b5ba93b8536edd064fa2736034109df51b9527..49eb5d32110ad62b5c603fcef60e1cd976104f54 100644
--- a/homeassistant/components/switch/edimax.py
+++ b/homeassistant/components/switch/edimax.py
@@ -83,14 +83,13 @@ class SmartPlugSwitch(SwitchDevice):
     def update(self):
         """Update edimax switch."""
         try:
-            self._now_power = float(self.smartplug.now_power) / 1000000.0
-        except (TypeError, ValueError):
+            self._now_power = float(self.smartplug.now_power)
+        except ValueError:
             self._now_power = None
 
         try:
-            self._now_energy_day = (float(self.smartplug.now_energy_day) /
-                                    1000.0)
-        except (TypeError, ValueError):
+            self._now_energy_day = float(self.smartplug.now_energy_day)
+        except ValueError:
             self._now_energy_day = None
 
         self._state = self.smartplug.state == 'ON'