diff --git a/homeassistant/components/binary_sensor/deconz.py b/homeassistant/components/binary_sensor/deconz.py
index 97f78ff21d0..07524a2d868 100644
--- a/homeassistant/components/binary_sensor/deconz.py
+++ b/homeassistant/components/binary_sensor/deconz.py
@@ -25,8 +25,9 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     sensors = hass.data[DECONZ_DATA].sensors
     entities = []
 
-    for sensor in sensors.values():
-        if sensor.type in DECONZ_BINARY_SENSOR:
+    for key in sorted(sensors.keys(), key=int):
+        sensor = sensors[key]
+        if sensor and sensor.type in DECONZ_BINARY_SENSOR:
             entities.append(DeconzBinarySensor(sensor))
     async_add_devices(entities, True)
 
diff --git a/homeassistant/components/deconz/__init__.py b/homeassistant/components/deconz/__init__.py
index 06b08a9b9a8..88eb893d897 100644
--- a/homeassistant/components/deconz/__init__.py
+++ b/homeassistant/components/deconz/__init__.py
@@ -17,7 +17,7 @@ from homeassistant.helpers import discovery
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util.json import load_json, save_json
 
-REQUIREMENTS = ['pydeconz==24']
+REQUIREMENTS = ['pydeconz==25']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -90,6 +90,7 @@ def async_setup_deconz(hass, config, deconz_config):
     Load config, group, light and sensor data for server information.
     Start websocket for push notification of state changes from deCONZ.
     """
+    _LOGGER.debug('deCONZ config %s', deconz_config)
     from pydeconz import DeconzSession
     websession = async_get_clientsession(hass)
     deconz = DeconzSession(hass.loop, websession, **deconz_config)
diff --git a/homeassistant/components/sensor/deconz.py b/homeassistant/components/sensor/deconz.py
index 2f1ff373581..3a3050eac79 100644
--- a/homeassistant/components/sensor/deconz.py
+++ b/homeassistant/components/sensor/deconz.py
@@ -29,8 +29,9 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     sensors = hass.data[DECONZ_DATA].sensors
     entities = []
 
-    for sensor in sensors.values():
-        if sensor.type in DECONZ_SENSOR:
+    for key in sorted(sensors.keys(), key=int):
+        sensor = sensors[key]
+        if sensor and sensor.type in DECONZ_SENSOR:
             if sensor.type in DECONZ_REMOTE:
                 DeconzEvent(hass, sensor)
                 if sensor.battery:
diff --git a/requirements_all.txt b/requirements_all.txt
index efe35f11049..24c5e0779b8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -681,7 +681,7 @@ pycsspeechtts==1.0.2
 pydaikin==0.4
 
 # homeassistant.components.deconz
-pydeconz==24
+pydeconz==25
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5