diff --git a/org.openhab.binding.zigbee/ESH-INF/thing/xiaomi/lumisensor86sw2.xml b/org.openhab.binding.zigbee/ESH-INF/thing/xiaomi/lumisensor86sw2.xml
new file mode 100644
index 000000000..2e0409a7f
--- /dev/null
+++ b/org.openhab.binding.zigbee/ESH-INF/thing/xiaomi/lumisensor86sw2.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="zigbee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
+
+	<!-- These devices do not correctly report their clusters, so they need a static thing definition for the binding to inject the correct clusters into the ZigBeeNode -->
+
+	<thing-type id="xiaomi_lumisensor86sw2" listed="false">
+		<label>Xiaomi Wireless 2-Button Switch</label>
+		<description>Xiaomi Wireless 2-Button Switch</description>
+
+		<channels>
+			<channel id="switch_1" typeId="switch_onoff">
+				<properties>
+					<property name="zigbee_endpoint">1</property>
+					<property name="zigbee_inputclusters">6</property>
+				</properties>
+			</channel>
+			<channel id="switch_2" typeId="switch_onoff">
+				<properties>
+					<property name="zigbee_endpoint">2</property>
+					<property name="zigbee_inputclusters">6</property>
+				</properties>
+			</channel>
+			<channel id="switch_3" typeId="switch_onoff">
+				<properties>
+					<property name="zigbee_endpoint">3</property>
+					<property name="zigbee_inputclusters">6</property>
+				</properties>
+			</channel>
+		</channels>
+
+		<properties>
+			<property name="vendor">Xiaomi</property>
+			<property name="modelId">lumi.sensor_86sw2</property>
+			<property name="zigbee_logicaltype">END_DEVICE</property>
+		</properties>
+
+		<representation-property>zigbee_macaddress</representation-property>
+
+		<config-description>
+			<parameter name="zigbee_macaddress" type="text" readOnly="true" required="true">
+				<label>MAC Address</label>
+			</parameter>
+		</config-description>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/org.openhab.binding.zigbee/src/main/resources/discovery.txt b/org.openhab.binding.zigbee/src/main/resources/discovery.txt
index 7e3b3f75d..c2f7cbe6e 100644
--- a/org.openhab.binding.zigbee/src/main/resources/discovery.txt
+++ b/org.openhab.binding.zigbee/src/main/resources/discovery.txt
@@ -6,5 +6,6 @@ bitron-video-av2010-34,vendor=Bitron Video,modelId=AV2010/34
 xiaomi_lumisensorht,modelId=lumi.sensor_ht
 xiaomi_lumisensor-motion,modelId=lumi.sensor_motion
 xiaomi_lumiremoteb286acn01,modelId=lumi.remote.b286acn01
+xiaomi_lumisensor86sw2,modelId=lumi.sensor_86sw2
 innr-rc-110,vendor=innr,modelId=RC 110
 osram-switch-4x-eu,vendor=OSRAM,modelId=Switch 4x EU-LIGHTIFY