diff --git a/setup.py b/setup.py
index 3a8258a5eb..f6355a646b 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-VERSION = "0.0.29"
+VERSION = "0.0.30"
 
 
 def readme():
diff --git a/zhaquirks/smartthings/moisturev4.py b/zhaquirks/smartthings/moisturev4.py
index d85e61fff2..5c0098335b 100755
--- a/zhaquirks/smartthings/moisturev4.py
+++ b/zhaquirks/smartthings/moisturev4.py
@@ -1,6 +1,6 @@
 """Device handler for smartthings moistureV4 sensor."""
 from zigpy.profiles import zha
-from zigpy.quirks import CustomDevice
+from zigpy.quirks import CustomCluster, CustomDevice
 from zigpy.zcl.clusters.general import Basic, BinaryInput, Identify, Ota, PollControl
 from zigpy.zcl.clusters.measurement import TemperatureMeasurement
 from zigpy.zcl.clusters.security import IasZone
@@ -18,7 +18,7 @@
 )
 
 
-class CustomIasZone(IasZone):
+class CustomIasZone(CustomCluster, IasZone):
     """Custom IasZone cluster."""
 
     MOISTURE_TYPE = 0x002A
diff --git a/zhaquirks/xiaomi/aqara/wleak_aq1.py b/zhaquirks/xiaomi/aqara/wleak_aq1.py
index 6ab33aa78f..8d1f8aaa28 100644
--- a/zhaquirks/xiaomi/aqara/wleak_aq1.py
+++ b/zhaquirks/xiaomi/aqara/wleak_aq1.py
@@ -1,9 +1,9 @@
 """Xiaomi aqara leak sensor device."""
 from zigpy.profiles import zha
+from zigpy.quirks import CustomCluster
 from zigpy.zcl.clusters.general import Identify, Ota
 from zigpy.zcl.clusters.security import IasZone
 
-from .. import LUMI, BasicCluster, PowerConfigurationCluster, XiaomiCustomDevice
 from ...const import (
     DEVICE_TYPE,
     ENDPOINTS,
@@ -12,9 +12,10 @@
     OUTPUT_CLUSTERS,
     PROFILE_ID,
 )
+from .. import LUMI, BasicCluster, PowerConfigurationCluster, XiaomiCustomDevice
 
 
-class CustomIasZone(IasZone):
+class CustomIasZone(CustomCluster, IasZone):
     """Custom IasZone cluster."""
 
     MOISTURE_TYPE = 0x002A