diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index b2d218506..e811b405e 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -295,17 +295,15 @@ void CFrontend::getFEInfo(void)
 				printf("[fe%d/%d] add delivery system DVB-S (delivery_system: %d)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i]);
 				break;
 			case SYS_DVBS2:
-				deliverySystemMask |= DVB_S2;
-				fe_can_multistream = info.caps & FE_CAN_MULTISTREAM;
-				printf("[fe%d/%d] add delivery system DVB-S2 (delivery_system: %d / Multistream: %s)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i], fe_can_multistream ? "yes" :"no");
-				break;
-#if BOXMODEL_VUPLUS_ARM
 			case SYS_DVBS2X:
-				deliverySystemMask |= DVB_S2X;
+				deliverySystemMask |= DVB_S2;
+				printf("[fe%d/%d] add delivery system DVB-S2 (delivery_system: %d)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i]);
 				fe_can_multistream = info.caps & FE_CAN_MULTISTREAM;
-				printf("[fe%d/%d] add delivery system DVB-S2X (delivery_system: %d / Multistream: %s)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i], fe_can_multistream ? "yes" :"no");
+				if (fe_can_multistream) {
+					deliverySystemMask |= DVB_S2X;
+					printf("[fe%d/%d] add delivery system DVB-S2X (delivery_system: %d / Multistream: %s)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i], fe_can_multistream ? "yes" :"no");
+				}
 				break;
-#endif
 			case SYS_DTMB:
 				deliverySystemMask |= DTMB;
 				printf("[fe%d/%d] add delivery system DTMB (delivery_system: %d)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i]);