diff --git a/src/components/quad-status/BottomStatusIcons.vue b/src/components/quad-status/BottomStatusIcons.vue
index 461b95579ca..de89414fbfe 100644
--- a/src/components/quad-status/BottomStatusIcons.vue
+++ b/src/components/quad-status/BottomStatusIcons.vue
@@ -19,27 +19,44 @@
 </template>
 
 <script>
+import { bit_check } from "../../js/bit";
+
 export default {
     props: {
         lastReceivedTimestamp: { type: Number, default: 0 },
-        auxConfig: { type: Array, default: () => [] },
+        mode: { type: Number, default: 0 },
+        auxConfig: { type: Object, default: null },
     },
     computed: {
-        setActiveLink() {
-            const active = performance.now() - this.lastReceivedTimestamp < 300;
-            if (active) {
+        setActiveArmed() {
+            if (!this.auxConfig?.length) {
+                return false;
+            }
+            if (
+                this.auxConfig.includes("ARM") &&
+                bit_check(this.mode, this.auxConfig.indexOf("ARM"))
+            ) {
                 return true;
             }
             return false;
         },
-        setActiveArmed() {
-            if (this.auxConfig.length === 0) return false;
-            if (this.auxConfig.includes("ARM")) return true;
+        setFailsafeActive() {
+            if (!this.auxConfig?.length) {
+                return false;
+            }
+            if (
+                this.auxConfig.includes("FAILSAFE") &&
+                bit_check(this.mode, this.auxConfig.indexOf("FAILSAFE"))
+            ) {
+                return true;
+            }
             return false;
         },
-        setFailsafeActive() {
-            if (this.auxConfig.length === 0) return false;
-            if (this.auxConfig.includes("FAILSAFE")) return true;
+        setActiveLink() {
+            const active = performance.now() - this.lastReceivedTimestamp < 300;
+            if (active) {
+                return true;
+            }
             return false;
         },
     },