diff --git a/companion/src/radiodata.cpp b/companion/src/radiodata.cpp
index e34e7325b..d6286de80 100644
--- a/companion/src/radiodata.cpp
+++ b/companion/src/radiodata.cpp
@@ -31,7 +31,7 @@ RawSource RawSource::convert(Board::Type before, Board::Type after)
   }
 
   if (IS_HORUS(after)) {
-    if (IS_TARANIS_X9D(before) || IS_TARANIS_X7(before)) {
+    if (IS_TARANIS_X9D(before)) {
       if (type == SOURCE_TYPE_STICK && index >= 7) {
         // LS and RS on Horus are after sliders L1 and L2
         index += 2;
@@ -39,6 +39,13 @@ RawSource RawSource::convert(Board::Type before, Board::Type after)
     }
   }
 
+  // No S3, LS and RS on X7 board
+  if (IS_TARANIS_X7(after)) {
+    if (type == SOURCE_TYPE_STICK && index >= 6) {
+      index = 5;
+    }
+  }
+
   // SWI to SWR don't exist on !X9E board
   if (!IS_TARANIS_X9E(after) && IS_TARANIS_X9E(before)) {
     if (type == SOURCE_TYPE_SWITCH && index >= 8) {