diff --git a/flix/failsafe.ino b/flix/failsafe.ino
index b70f079..1767b1f 100644
--- a/flix/failsafe.ino
+++ b/flix/failsafe.ino
@@ -16,6 +16,8 @@ void failsafe() {
 
 // RC loss failsafe
 void rcLossFailsafe() {
+	if (mode == AUTO) return;
+	if (!armed) return;
 	if (t - controlTime > RC_LOSS_TIMEOUT) {
 		descend();
 	}