diff --git a/homeassistant/components/neato/vacuum.py b/homeassistant/components/neato/vacuum.py
index 061d8fd04c8..8bbf07f2091 100644
--- a/homeassistant/components/neato/vacuum.py
+++ b/homeassistant/components/neato/vacuum.py
@@ -159,6 +159,8 @@ class NeatoConnectedVacuum(StateVacuumDevice):
             self._clean_state = STATE_ERROR
             self._status_state = ERRORS.get(self._state['error'])
 
+        self._battery_level = self._state['details']['charge']
+
         if not self._mapdata.get(self._robot_serial, {}).get('maps', []):
             return
         self.clean_time_start = (
@@ -182,8 +184,6 @@ class NeatoConnectedVacuum(StateVacuumDevice):
         self.clean_battery_end = (
             self._mapdata[self._robot_serial]['maps'][0]['run_charge_at_end'])
 
-        self._battery_level = self._state['details']['charge']
-
         if self._robot_has_map:
             if self._state['availableServices']['maps'] != "basic-1":
                 if self._robot_maps[self._robot_serial]: