diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index b37dd3e55..bdb777334 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -451,7 +451,8 @@ PACK(struct ModuleData {
       int8_t refreshRate;  // definition as framelength for ppm (* 5 + 225 = time in 1/10 ms)
     } sbus);
     NOBACKUP(PACK(struct {
-      uint8_t receivers; // 5 bits spare
+      uint8_t receiver:7; // 4 bits spare
+      uint8_t racingMode:1;
       char receiverName[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME];
     }) pxx2);
     NOBACKUP(PACK(struct {
@@ -475,14 +476,21 @@ PACK(struct ModuleData {
   };
 
   // Helper functions to set both of the rfProto protocol at the same time
-  NOBACKUP(inline uint8_t getMultiProtocol() {
+  NOBACKUP(inline uint8_t getMultiProtocol() const
+  {
     return ((uint8_t) (rfProtocol & 0x0F)) + (multi.rfProtocolExtra << 4);
   })
 
-  NOBACKUP(inline void setMultiProtocol(uint8_t proto) {
+  NOBACKUP(inline void setMultiProtocol(uint8_t proto)
+  {
     rfProtocol = (uint8_t) (proto & 0x0F);
     multi.rfProtocolExtra = (proto & 0x70) >> 4;
   })
+
+  NOBACKUP(inline uint8_t getChannelsCount() const
+  {
+    return channelsCount + 8;
+  })
 });
 
 /*
diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp
index 817abf157..cf4c87d39 100644
--- a/radio/src/functions.cpp
+++ b/radio/src/functions.cpp
@@ -381,7 +381,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
             break;
 
           case FUNC_RACING_MODE:
-            if (isRacingModeAllowed()) {
+            if (isRacingModeEnabled()) {
               newActiveFunctions |= (1u << FUNCTION_RACING_MODE);
             }
             break;
diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index b38f7e6bc..95ec079a4 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1236,8 +1236,8 @@ void menuModelSetup(event_t event)
       case ITEM_MODEL_SETUP_INTERNAL_MODULE_RACING_MODE:
       {
         ModuleData & moduleData = g_model.moduleData[moduleIdx];
-        lcdDrawTextAlignedLeft(y, STR_RACING_MODE);
-        moduleState[moduleIdx].racingMode = editCheckBox(moduleState[moduleIdx].racingMode, MODEL_SETUP_2ND_COLUMN, y, "", attr, event);
+        lcdDrawText(INDENT_WIDTH, y, STR_RACING_MODE);
+        moduleData.pxx2.racingMode = editCheckBox(moduleData.pxx2.racingMode, MODEL_SETUP_2ND_COLUMN, y, "", attr, event);
         break;
       }
 #endif
@@ -1522,7 +1522,6 @@ void menuModelSetup(event_t event)
               if (event == EVT_KEY_LONG(KEY_ENTER)) {
                 killEvents(event);
                 setCustomFailsafe(moduleIdx);
-                storageDirty(EE_MODEL);
                 AUDIO_WARNING1();
                 SEND_FAILSAFE_NOW(moduleIdx);
               }
diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index e8b5f4c0b..2e719c756 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -1104,8 +1104,8 @@ void menuModelSetup(event_t event)
       {
         uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
         ModuleData & moduleData = g_model.moduleData[moduleIdx];
-        lcdDrawTextAlignedLeft(y, STR_RACING_MODE);
-        moduleState[moduleIdx].racingMode = editCheckBox(moduleState[moduleIdx].racingMode, MODEL_SETUP_2ND_COLUMN, y, "", attr, event);
+        lcdDrawText(INDENT_WIDTH, y, STR_RACING_MODE);
+        moduleData.pxx2.racingMode = editCheckBox(moduleData.pxx2.racingMode, MODEL_SETUP_2ND_COLUMN, y, "", attr, event);
         break;
       }
 
@@ -1281,7 +1281,6 @@ void menuModelSetup(event_t event)
               if (event == EVT_KEY_LONG(KEY_ENTER)) {
                 killEvents(event);
                 setCustomFailsafe(moduleIdx);
-                storageDirty(EE_MODEL);
                 AUDIO_WARNING1();
                 SEND_FAILSAFE_NOW(moduleIdx);
               }
diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp
index 0dd737140..562d943f3 100644
--- a/radio/src/gui/480x272/model_setup.cpp
+++ b/radio/src/gui/480x272/model_setup.cpp
@@ -1254,8 +1254,8 @@ bool menuModelSetup(event_t event)
       case ITEM_MODEL_SETUP_INTERNAL_MODULE_RACING_MODE:
       {
         ModuleData & moduleData = g_model.moduleData[moduleIdx];
-        lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RACING_MODE);
-        moduleState[moduleIdx].racingMode = editCheckBox(moduleState[moduleIdx].racingMode, MODEL_SETUP_2ND_COLUMN, y, "", attr, event);
+        lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, STR_RACING_MODE);
+        moduleData.pxx2.racingMode = editCheckBox(moduleData.pxx2.racingMode, MODEL_SETUP_2ND_COLUMN, y, "", attr, event);
         break;
       }
 #endif
@@ -1666,7 +1666,6 @@ bool menuModelSetup(event_t event)
               if (event == EVT_KEY_LONG(KEY_ENTER)) {
                 killEvents(event);
                 setCustomFailsafe(moduleIdx);
-                storageDirty(EE_MODEL);
                 AUDIO_WARNING1();
                 SEND_FAILSAFE_NOW(moduleIdx);
               }
diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h
index 45966fd33..80401403f 100644
--- a/radio/src/gui/gui_common.h
+++ b/radio/src/gui/gui_common.h
@@ -186,10 +186,12 @@ inline uint8_t MODULE_CHANNELS_ROWS(int moduleIdx)
 
 inline bool isRacingModeAllowed()
 {
-  if (isModulePXX2(INTERNAL_MODULE) && 0 == g_model.moduleData[INTERNAL_MODULE].channelsCount && moduleState[INTERNAL_MODULE].racingMode)
-    return true;
-  else
-    return false;
+  return isModulePXX2(INTERNAL_MODULE) && g_model.moduleData[INTERNAL_MODULE].getChannelsCount() == 8;
+}
+
+inline bool isRacingModeEnabled()
+{
+  return isRacingModeAllowed() && g_model.moduleData[INTERNAL_MODULE].pxx2.racingMode;
 }
 
 inline uint8_t IF_ALLOW_RACING_MODE(int moduleIdx)
@@ -197,9 +199,8 @@ inline uint8_t IF_ALLOW_RACING_MODE(int moduleIdx)
   if (!IS_MODULE_ENABLED(moduleIdx)) {
     return HIDDEN_ROW;
   }
-  else if (isModulePXX2(moduleIdx)) {
-    if (0 == g_model.moduleData[moduleIdx].channelsCount)
-      return 1;
+  else if (isRacingModeAllowed()) {
+    return 0;
   }
   return HIDDEN_ROW;
 }
diff --git a/radio/src/lua/api_model.cpp b/radio/src/lua/api_model.cpp
index 8bc7e3a6a..f19246e62 100644
--- a/radio/src/lua/api_model.cpp
+++ b/radio/src/lua/api_model.cpp
@@ -135,7 +135,7 @@ static int luaModelGetModule(lua_State *L)
     lua_pushtableinteger(L, "subType", module.subType);
     lua_pushtableinteger(L, "modelId", g_model.header.modelId[idx]);
     lua_pushtableinteger(L, "firstChannel", module.channelsStart);
-    lua_pushtableinteger(L, "channelsCount", module.channelsCount + 8);
+    lua_pushtableinteger(L, "channelsCount", module.getChannelsCount());
     lua_pushtableinteger(L, "Type", module.type);
 #if defined(MULTIMODULE)
     if (module.type == MODULE_TYPE_MULTIMODULE) {
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index 8152f92e5..a96adba3f 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -49,7 +49,7 @@ void Pxx2Pulses::addFlag1(uint8_t module)
   }
 
   uint8_t flag1 = subType << 4u;
-  if (isFunctionActive(FUNCTION_RACING_MODE)) {
+  if (isRacingModeEnabled() && isFunctionActive(FUNCTION_RACING_MODE)) {
     flag1 |= PXX2_CHANNELS_FLAG1_RACING_MODE;
   }
 
diff --git a/radio/src/thirdparty/libACCESS b/radio/src/thirdparty/libACCESS
index 79a6921d2..63802e6d5 160000
--- a/radio/src/thirdparty/libACCESS
+++ b/radio/src/thirdparty/libACCESS
@@ -1 +1 @@
-Subproject commit 79a6921d2386236a44e87554195bf41dc412b445
+Subproject commit 63802e6d50a9c7e07a6ae063f162320227995248
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 01e48a3d4..bfb2e3006 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -1225,7 +1225,7 @@
 #define TR_JITTER_FILTER               "ADC Filtr"
 #define TR_RTC_CHECK                   TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE                "Auth-failure"
-#define TR_RACING_MODE                 INDENT "Racing mode"
+#define TR_RACING_MODE                 "Racing mode"
 
 #define ZSTR_VFR                       "VFR"
 #define ZSTR_RSSI                      "RSSI"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index 55ec1fc61..6c906b49e 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -1231,7 +1231,7 @@
 #define TR_JITTER_FILTER               "ADC Filter"
 #define TR_RTC_CHECK                   TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE                "Auth-failure"
-#define TR_RACING_MODE                 INDENT "Racing mode"
+#define TR_RACING_MODE                 "Racing mode"
 
 // ----------------------------------------------------------------
 #define ZSTR_VFR                       "VFR"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index d04dfecd8..d61d940ad 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -1229,7 +1229,7 @@
 #define TR_JITTER_FILTER               "ADC filter"
 #define TR_RTC_CHECK                   TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE                "Auth-failure"
-#define TR_RACING_MODE                 INDENT "Racing mode"
+#define TR_RACING_MODE                 "Racing mode"
 
 #define ZSTR_VFR                       "VFR"
 #define ZSTR_RSSI                      "RSSI"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index 4a4c0e45e..353aab18f 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -1228,7 +1228,7 @@
 #define TR_JITTER_FILTER       "Filtro ADC"
 #define TR_RTC_CHECK           TR("Check RTC", "Check RTC voltaje")
 #define TR_AUTH_FAILURE        "Fallo " LCDW_128_480_LINEBREAK  "autentificación"
-#define TR_RACING_MODE         INDENT "Racing mode"
+#define TR_RACING_MODE         "Racing mode"
 
 #define ZSTR_VFR               "VFR"
 #define ZSTR_RSSI              "RSSI"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index b6f72ac1a..025a3fd71 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -1237,7 +1237,7 @@
 #define TR_JITTER_FILTER       "ADC Filter"
 #define TR_RTC_CHECK           TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE                "Auth-failure"
-#define TR_RACING_MODE         INDENT "Racing mode"
+#define TR_RACING_MODE         "Racing mode"
 
 #define ZSTR_VFR               "VFR"
 #define ZSTR_RSSI              "RSSI"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index abc52a10c..247a4f2fc 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -1253,7 +1253,7 @@
 #define TR_JITTER_FILTER               "Filtre ADC"
 #define TR_RTC_CHECK                   TR("Vérif. RTC", "Vérif. pile RTC")
 #define TR_AUTH_FAILURE                "Auth-failure"
-#define TR_RACING_MODE                 INDENT "Racing mode"
+#define TR_RACING_MODE                 "Racing mode"
 
 #define ZSTR_VFR                       "VFR"
 #define ZSTR_RSSI                      "RSSI"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 9e46d9846..d7878777b 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -1246,7 +1246,7 @@
 #define TR_JITTER_FILTER       "Filtro ADC"
 #define TR_RTC_CHECK           TR("Controllo RTC", "Controllo volt. RTC")
 #define TR_AUTH_FAILURE        "Auth-failure"
-#define TR_RACING_MODE         INDENT "Racing mode"
+#define TR_RACING_MODE         "Racing mode"
 
 #define ZSTR_VFR               "VFR"
 #define ZSTR_RSSI              "RSSI"
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index de559721c..93fec41bf 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -1238,7 +1238,7 @@
 #define TR_JITTER_FILTER       "ADC Filter"
 #define TR_RTC_CHECK           TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE                "Auth-failure"
-#define TR_RACING_MODE                 INDENT "Racing mode"
+#define TR_RACING_MODE                 "Racing mode"
 
 #define ZSTR_VFR               "VFR"
 #define ZSTR_RSSI              "RSSI"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index f125ae98f..ba6192553 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -1245,7 +1245,7 @@
 #define TR_JITTER_FILTER       "ADC Filter"
 #define TR_RTC_CHECK           TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE                "Auth-failure"
-#define TR_RACING_MODE                 INDENT "Racing mode"
+#define TR_RACING_MODE                 "Racing mode"
 
 #define ZSTR_VFR               "VFR"
 #define ZSTR_RSSI              "RSSI"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index 9a18e4eb7..faa4c95bb 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -1245,7 +1245,7 @@
 #define TR_JITTER_FILTER       "ADC Filter"
 #define TR_RTC_CHECK           TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE        "Auth-failure"
-#define TR_RACING_MODE         INDENT "Racing mode"
+#define TR_RACING_MODE         "Racing mode"
 #define ZSTR_VFR               "VFR"
 #define ZSTR_RSSI              "RSSI"
 #define ZSTR_R9PW                      "R9PW"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 6e3b867f3..03a3d883f 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -1245,7 +1245,7 @@
 #define TR_JITTER_FILTER       "ADC Filter"
 #define TR_RTC_CHECK           TR("Check RTC", "Check RTC voltage")
 #define TR_AUTH_FAILURE                "Auth-failure"
-#define TR_RACING_MODE                 INDENT "Racing mode"
+#define TR_RACING_MODE                 "Racing mode"
 
 #define ZSTR_VFR               "VFR"
 #define ZSTR_RSSI              "RSSI"