diff --git a/homeassistant/components/deconz/services.py b/homeassistant/components/deconz/services.py
index f893b9880fd..f1b19c79fce 100644
--- a/homeassistant/components/deconz/services.py
+++ b/homeassistant/components/deconz/services.py
@@ -1,4 +1,5 @@
 """deCONZ services."""
+from pydeconz.utils import normalize_bridge_id
 import voluptuous as vol
 
 from homeassistant.helpers import config_validation as cv
@@ -97,15 +98,14 @@ async def async_configure_service(hass, data):
     See Dresden Elektroniks REST API documentation for details:
     http://dresden-elektronik.github.io/deconz-rest-doc/rest/
     """
-    bridgeid = data.get(CONF_BRIDGE_ID)
+    gateway = get_master_gateway(hass)
+    if CONF_BRIDGE_ID in data:
+        gateway = hass.data[DOMAIN][normalize_bridge_id(data[CONF_BRIDGE_ID])]
+
     field = data.get(SERVICE_FIELD, "")
     entity_id = data.get(SERVICE_ENTITY)
     data = data[SERVICE_DATA]
 
-    gateway = get_master_gateway(hass)
-    if bridgeid:
-        gateway = hass.data[DOMAIN][bridgeid]
-
     if entity_id:
         try:
             field = gateway.deconz_ids[entity_id] + field
@@ -120,7 +120,7 @@ async def async_refresh_devices_service(hass, data):
     """Refresh available devices from deCONZ."""
     gateway = get_master_gateway(hass)
     if CONF_BRIDGE_ID in data:
-        gateway = hass.data[DOMAIN][data[CONF_BRIDGE_ID]]
+        gateway = hass.data[DOMAIN][normalize_bridge_id(data[CONF_BRIDGE_ID])]
 
     groups = set(gateway.api.groups.keys())
     lights = set(gateway.api.lights.keys())
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index ef10641608d..b0deb01b3da 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -2,6 +2,7 @@
 
 bandit==1.6.2
 black==19.10b0
+codespell==v1.16.0
 flake8-docstrings==1.5.0
 flake8==3.7.9
 isort==v4.3.21