diff --git a/homeassistant/components/sensor/efergy.py b/homeassistant/components/sensor/efergy.py
index da7181972cb..0f24905c5f5 100644
--- a/homeassistant/components/sensor/efergy.py
+++ b/homeassistant/components/sensor/efergy.py
@@ -33,11 +33,11 @@ CONF_CURRENT_VALUES = 'current_values'
 DEFAULT_PERIOD = 'year'
 
 SENSOR_TYPES = {
-    CONF_INSTANT: ['Energy Usage', 'kW'],
+    CONF_INSTANT: ['Energy Usage', 'W'],
     CONF_AMOUNT: ['Energy Consumed', 'kWh'],
     CONF_BUDGET: ['Energy Budget', None],
     CONF_COST: ['Energy Cost', None],
-    CONF_CURRENT_VALUES: ['Per-Device Usage', 'kW']
+    CONF_CURRENT_VALUES: ['Per-Device Usage', 'W']
 }
 
 TYPES_SCHEMA = vol.In(SENSOR_TYPES)
@@ -120,7 +120,7 @@ class EfergySensor(Entity):
             if self.type == 'instant_readings':
                 url_string = _RESOURCE + 'getInstant?token=' + self.app_token
                 response = get(url_string, timeout=10)
-                self._state = response.json()['reading'] / 1000
+                self._state = response.json()['reading']
             elif self.type == 'amount':
                 url_string = _RESOURCE + 'getEnergy?token=' + self.app_token \
                     + '&offset=' + self.utc_offset + '&period=' \
@@ -144,7 +144,7 @@ class EfergySensor(Entity):
                 for sensor in response.json():
                     if self.sid == sensor['sid']:
                         measurement = next(iter(sensor['data'][0].values()))
-                        self._state = measurement / 1000
+                        self._state = measurement
             else:
                 self._state = 'Unknown'
         except (RequestException, ValueError, KeyError):
diff --git a/tests/components/sensor/test_efergy.py b/tests/components/sensor/test_efergy.py
index 3ecedcd12f3..83309329a11 100644
--- a/tests/components/sensor/test_efergy.py
+++ b/tests/components/sensor/test_efergy.py
@@ -85,13 +85,13 @@ class TestEfergySensor(unittest.TestCase):
               'sensor': ONE_SENSOR_CONFIG})
         self.assertEqual('38.21',
                          self.hass.states.get('sensor.energy_consumed').state)
-        self.assertEqual('1.58',
+        self.assertEqual('1580',
                          self.hass.states.get('sensor.energy_usage').state)
         self.assertEqual('ok',
                          self.hass.states.get('sensor.energy_budget').state)
         self.assertEqual('5.27',
                          self.hass.states.get('sensor.energy_cost').state)
-        self.assertEqual('1.628',
+        self.assertEqual('1628',
                          self.hass.states.get('sensor.efergy_728386').state)
 
     @requests_mock.Mocker()
@@ -100,9 +100,9 @@ class TestEfergySensor(unittest.TestCase):
         mock_responses(mock)
         assert setup_component(self.hass, 'sensor', {
               'sensor': MULTI_SENSOR_CONFIG})
-        self.assertEqual('0.218',
+        self.assertEqual('218',
                          self.hass.states.get('sensor.efergy_728386').state)
-        self.assertEqual('1.808',
+        self.assertEqual('1808',
                          self.hass.states.get('sensor.efergy_0').state)
-        self.assertEqual('0.312',
+        self.assertEqual('312',
                          self.hass.states.get('sensor.efergy_728387').state)