diff --git a/radio/src/gui/Taranis/helpers.cpp b/radio/src/gui/Taranis/helpers.cpp
index 8c0f16ff3..7174326b3 100755
--- a/radio/src/gui/Taranis/helpers.cpp
+++ b/radio/src/gui/Taranis/helpers.cpp
@@ -167,12 +167,7 @@ bool isInputSourceAvailable(int source)
 
   if (source>=MIXSRC_FIRST_TELEM && source<=MIXSRC_LAST_TELEM) {
     div_t qr = div(source-MIXSRC_FIRST_TELEM, 3);
-    if (g_model.telemetrySensors[qr.quot].unit >= UNIT_DATETIME)
-      return false;
-    else if (qr.rem == 0)
-      return isTelemetryFieldAvailable(qr.quot);
-    else
-      return isTelemetryFieldComparisonAvailable(qr.quot);
+    return isTelemetryFieldAvailable(qr.quot) && isTelemetryFieldComparisonAvailable(qr.quot);
   }
 
   return false;
diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h
index 981d623f2..9ad0d23a1 100644
--- a/radio/src/telemetry/telemetry.h
+++ b/radio/src/telemetry/telemetry.h
@@ -177,9 +177,7 @@ inline bool isTelemetryFieldComparisonAvailable(int index)
   TelemetrySensor & sensor = g_model.telemetrySensors[index];
   if (sensor.type == TELEM_TYPE_CALCULATED)
     return true;
-  if (sensor.unit == UNIT_GPS)
-    return false;
-  if (sensor.unit == UNIT_DATETIME)
+  if (sensor.unit >= UNIT_DATETIME)
     return false;
   return (sensor.id != 0);
 }