diff --git a/common/src/main/java/io/homeassistant/companion/android/common/data/integration/Entity.kt b/common/src/main/java/io/homeassistant/companion/android/common/data/integration/Entity.kt
index 15a8c01a7..78c19a52b 100644
--- a/common/src/main/java/io/homeassistant/companion/android/common/data/integration/Entity.kt
+++ b/common/src/main/java/io/homeassistant/companion/android/common/data/integration/Entity.kt
@@ -648,5 +648,7 @@ fun <T> Entity<T>.isExecuting() = when (state) {
     "locking" -> true
     "opening" -> true
     "unlocking" -> true
+    "buffering" -> true
+    "disarming" -> true
     else -> false
 }