diff --git a/.homeychangelog.json b/.homeychangelog.json
index 56e2ee9..d621cef 100644
--- a/.homeychangelog.json
+++ b/.homeychangelog.json
@@ -542,6 +542,10 @@
   "1.5.14": {
     "en": "Added switch deactivation for camera device.",
     "de": "Schalter-Deaktivierung für Kamerageräte ergänzt."
+  },
+  "1.5.15": {
+    "en": "Fixed 'The alarm or switch turned on' trigger for onoff/onoff_button capabilities.",
+    "de": "Fehler beim Auslösen des 'Der Alarm oder Schalter ist angegangen' Triggers für onoff/onoff_button Capabilities."
   }
 
 }
diff --git a/.homeycompose/app.json b/.homeycompose/app.json
index d9b8406..eae3717 100644
--- a/.homeycompose/app.json
+++ b/.homeycompose/app.json
@@ -1,6 +1,6 @@
 {
   "id": "io.home-assistant.community",
-  "version": "1.5.14",
+  "version": "1.5.15",
   "compatibility": ">=8.1.0",
   "sdk": 3,
   "brandColor": "#0DA6EA",
diff --git a/app.json b/app.json
index 824c4c8..1f81a05 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "_comment": "This file is generated. Please edit .homeycompose/app.json instead.",
   "id": "io.home-assistant.community",
-  "version": "1.5.13",
+  "version": "1.5.15",
   "compatibility": ">=8.1.0",
   "sdk": 3,
   "brandColor": "#0DA6EA",
@@ -4531,9 +4531,9 @@
               "type": "checkbox",
               "value": false,
               "label": {
-                "en": "Disable quick action for device tile",
-                "de": "Deaktiviere die Schnellaktion für die Gerätekachel",
-                "nl": "Schakel snelle actie voor apparaattegel uit"
+                "en": "Disable quick action and switch",
+                "de": "Deaktiviere Schnellaktion und Schalter",
+                "nl": "Schakel snelle actie en schakelaars uit"
               }
             }
           ]
diff --git a/drivers/basedevice.js b/drivers/basedevice.js
index 7f4124a..6aa0614 100644
--- a/drivers/basedevice.js
+++ b/drivers/basedevice.js
@@ -551,7 +551,7 @@ class BaseDevice extends Homey.Device {
                             // Standard capaility changed trigger
                             await this.homey.app._flowTriggerCapabilityChanged.trigger(this, tokens, state);
                             // additional alarm on/off trigger
-                            if (keys[i].startsWith("alarm")){
+                            if (keys[i].startsWith("alarm") || keys[i].startsWith("onoff")){
                                 if (newValue){
                                     await this.homey.app._flowTriggerGenericAlarmTrue.trigger(this, tokens, state);
                                 }