diff --git a/radio/src/telemetry/crossfire.h b/radio/src/telemetry/crossfire.h
index 430af2dad..6007de2c2 100644
--- a/radio/src/telemetry/crossfire.h
+++ b/radio/src/telemetry/crossfire.h
@@ -114,8 +114,12 @@ const uint8_t CROSSFIRE_FRAME_PERIODS[] = {
   #define CROSSFIRE_INDEX_TO_STORE(i) i
 #else
   // index 1 (400000) is the default 0 value
-  #define CROSSFIRE_STORE_TO_INDEX(v) (v + 1) % DIM(CROSSFIRE_BAUDRATES)
-  #define CROSSFIRE_INDEX_TO_STORE(i) (i + 4) % DIM(CROSSFIRE_BAUDRATES)
+  #define CROSSFIRE_DEFAULT_INDEX 1
+  #define CROSSFIRE_STORE_TO_INDEX(v) \
+    (v + CROSSFIRE_DEFAULT_INDEX) % DIM(CROSSFIRE_BAUDRATES)
+  #define CROSSFIRE_INDEX_TO_STORE(i)                          \
+    (i + (DIM(CROSSFIRE_BAUDRATES) - CROSSFIRE_DEFAULT_INDEX)) \
+        % DIM(CROSSFIRE_BAUDRATES)
 #endif
 
 #define CROSSFIRE_BAUDRATE    CROSSFIRE_BAUDRATES[CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.telemetryBaudrate)]