diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino
index f83f591..c5ae74a 100644
--- a/Multiprotocol/Telemetry.ino
+++ b/Multiprotocol/Telemetry.ino
@@ -109,9 +109,22 @@ static void multi_send_status()
 		else
 			if (!IS_BIND_DONE_on)
 				flags |= 0x08;
-		//Failsafe supported
-		if((protocol==MODE_HISKY && sub_protocol==HK310) || protocol==MODE_DEVO || protocol==MODE_SFHSS || protocol==MODE_WK2x01 || protocol==MODE_AFHDS2A) //|| protocol==MODE_FRSKYX)
-			flags |= 0x20;
+		#ifdef FAILSAFE_ENABLE
+			//Is failsafe supported?
+			switch (protocol)
+			{
+				case MODE_HISKY:
+					if(sub_protocol!=HK310)
+						break;
+				case MODE_AFHDS2A:
+				case MODE_DEVO:
+				case MODE_SFHSS:
+				case MODE_WK2x01:
+					flags |= 0x20;	//Yes
+				default:
+					break;
+			}
+		#endif
 	}
 	Serial_write(flags);