diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index de5c5423fe1..707e0292c45 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -4,6 +4,7 @@ import asyncio
 import logging
 
 import voluptuous as vol
+from zhaquirks import setup as setup_quirks
 from zigpy.config import CONF_DEVICE, CONF_DEVICE_PATH
 
 from homeassistant import config_entries, const as ha_const
@@ -92,9 +93,7 @@ async def async_setup_entry(hass, config_entry):
         zha_data.setdefault(platform, [])
 
     if config.get(CONF_ENABLE_QUIRKS, True):
-        # needs to be done here so that the ZHA module is finished loading
-        # before zhaquirks is imported
-        import zhaquirks  # noqa: F401 pylint: disable=unused-import, import-outside-toplevel
+        setup_quirks(config)
 
     zha_gateway = ZHAGateway(hass, config, config_entry)
     await zha_gateway.async_initialize()
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index 6493bd138bf..fbe66741bcf 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -7,7 +7,7 @@
     "bellows==0.23.1",
     "pyserial==3.5",
     "pyserial-asyncio==0.5",
-    "zha-quirks==0.0.54",
+    "zha-quirks==0.0.55",
     "zigpy-cc==0.5.2",
     "zigpy-deconz==0.12.0",
     "zigpy==0.33.0",
diff --git a/requirements_all.txt b/requirements_all.txt
index faa18b0051b..7e4842ac106 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2369,7 +2369,7 @@ zengge==0.2
 zeroconf==0.29.0
 
 # homeassistant.components.zha
-zha-quirks==0.0.54
+zha-quirks==0.0.55
 
 # homeassistant.components.zhong_hong
 zhong_hong_hvac==1.0.9
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index e6ba592e68d..b670eaa2050 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1227,7 +1227,7 @@ zeep[async]==4.0.0
 zeroconf==0.29.0
 
 # homeassistant.components.zha
-zha-quirks==0.0.54
+zha-quirks==0.0.55
 
 # homeassistant.components.zha
 zigpy-cc==0.5.2