diff --git a/index.js b/index.js
index 1eeb591..aa42fc9 100644
--- a/index.js
+++ b/index.js
@@ -101,7 +101,7 @@ mqttClient.on("message", (topic, message) => {
 	switch (topic) {
 		case "motion": {
 			const data = JSON.parse(message);
-			if (alarmStatus === Armed && data.value === true) {
+			if ((alarmStatus === Armed || alarmStatus === Triggered) && data.value === true) {
 				console.log("motion");
 				triggerAlarm(data.deviceId);
 			}
@@ -109,7 +109,7 @@ mqttClient.on("message", (topic, message) => {
 		}
 		case "sound": {
 			const data = JSON.parse(message);
-			if (alarmStatus === Armed) {
+			if (alarmStatus === Armed || alarmStatus === Triggered) {
 				console.log("sound", data.value);
 				triggerAlarm(data.deviceId);
 			}
@@ -118,7 +118,7 @@ mqttClient.on("message", (topic, message) => {
 		case "door/status": {
 			const data = JSON.parse(message);
 			console.log(data);
-			if (alarmStatus === Armed && data.open === true) {
+			if ((alarmStatus === Armed || alarmStatus === Triggered) && data.open === true) {
 				console.log("door sensor");
 				disarmingAlarm(data.deviceId);
 			}