--- org.openhab.binding.zwave-3.1.x/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveAlarmConverter.java	2022-05-04 20:14:08.691851613 +0200
+++ org.openhab.binding.zwave-3.1.x/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveAlarmConverter.java_new	2022-05-04 14:03:42.730811565 +0200
@@ -225,6 +225,10 @@
         // : Integer.parseInt(channel.getArguments().get("event"));
 
         ZWaveAlarmValueEvent eventAlarm = (ZWaveAlarmValueEvent) event;
+        // Don't trigger event if this item is bound to another alarm type
+        if (alarmType != null && AlarmType.valueOf(alarmType) != eventAlarm.getAlarmType()) {
+            return null;
+        }
         logger.debug("NODE {}: Alarm converter processing {}", eventAlarm.getNodeId(), eventAlarm.getReportType());
         switch (eventAlarm.getReportType()) {
             case ALARM:
@@ -238,9 +242,10 @@
 
     private State handleAlarmReport(ZWaveThingChannel channel, ZWaveAlarmValueEvent eventAlarm, String alarmType) {
         // Don't trigger event if this item is bound to another alarm type
-        if (alarmType != null && AlarmType.valueOf(alarmType) != eventAlarm.getAlarmType()) {
-            return null;
-        }
+        // if (alarmType != null && AlarmType.valueOf(alarmType) != eventAlarm.getAlarmType()) {
+        //    return null;
+        //}
+	// code moved to handleEvent
 
         // Check if an event is specified
         if (channel.getArguments().get("event") != null
@@ -356,7 +361,9 @@
                 if (events == null) {
                     logger.debug("NODE {}: Alarm converter NOTIFICATION event is {}, channel {} is not implemented.",
                             eventAlarm.getNodeId(), event, channelType);
-                    return null;
+                    //return null;
+		    //final default value will be DecimalType to allow Customer Dependent  (CD) channel
+                    return new DecimalType(eventAlarm.getAlarmEvent());
                 }
                 return events.get(notification);
         }