diff --git a/src/displays/menus/gametrakmodesettingsmenu.h b/src/displays/menus/gametrakmodesettingsmenu.h
index d26e832..698cac0 100644
--- a/src/displays/menus/gametrakmodesettingsmenu.h
+++ b/src/displays/menus/gametrakmodesettingsmenu.h
@@ -13,6 +13,7 @@ class ModesSettingsMenu;
 }
 
 namespace {
+#ifdef FEATURE_GAMETRAK
 class GametrakModeSettingsMenu :
     public MenuDisplay,
     public StaticText<TEXT_GAMETRAKMODESETTINGS>,
@@ -21,4 +22,5 @@ class GametrakModeSettingsMenu :
         makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<ModesSettingsMenu>, StaticMenuItemIcon<&icons::back>>
     >
 {};
+#endif
 }
diff --git a/src/screens.h b/src/screens.h
index d9358e3..f9a94f3 100644
--- a/src/screens.h
+++ b/src/screens.h
@@ -70,7 +70,9 @@ union X {
     EnableMenu enableMenu;
     FrontFeedbackDebugMenu frontFeedbackDebugMenu;
     BackFeedbackDebugMenu backFeedbackDebugMenu;
+#ifdef FEATURE_GAMETRAK
     GametrakModeSettingsMenu gametrakModeSettingsMenu;
+#endif
     GenericWifiSettingsMenu genericWifiSettingsMenu;
     GraphsMenu graphsMenu;
     InvertMenu invertMenu;
@@ -202,7 +204,9 @@ template<> decltype(displays.dynamicDebugMenu)                                 &
 template<> decltype(displays.enableMenu)                                       &getRefByType<decltype(displays.enableMenu)>()                                       { return displays.enableMenu; }
 template<> decltype(displays.frontFeedbackDebugMenu)                           &getRefByType<decltype(displays.frontFeedbackDebugMenu)>()                           { return displays.frontFeedbackDebugMenu; }
 template<> decltype(displays.backFeedbackDebugMenu)                            &getRefByType<decltype(displays.backFeedbackDebugMenu)>()                            { return displays.backFeedbackDebugMenu; }
+#ifdef FEATURE_GAMETRAK
 template<> decltype(displays.gametrakModeSettingsMenu)                         &getRefByType<decltype(displays.gametrakModeSettingsMenu)>()                         { return displays.gametrakModeSettingsMenu; }
+#endif
 template<> decltype(displays.genericWifiSettingsMenu)                          &getRefByType<decltype(displays.genericWifiSettingsMenu)>()                          { return displays.genericWifiSettingsMenu; }
 template<> decltype(displays.graphsMenu)                                       &getRefByType<decltype(displays.graphsMenu)>()                                       { return displays.graphsMenu; }
 template<> decltype(displays.invertMenu)                                       &getRefByType<decltype(displays.invertMenu)>()                                       { return displays.invertMenu; }
diff --git a/src/settings.h b/src/settings.h
index 0672b6c..0a2a81f 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -108,12 +108,14 @@ void Settings::executeForEverySetting(T &&callable)
     callable("gasMax", boardcomputerHardware.gasMax);
     callable("bremsMin", boardcomputerHardware.bremsMin);
     callable("bremsMax", boardcomputerHardware.bremsMax);
+#ifdef FEATURE_GAMETRAK
     callable("gametrakXMin", boardcomputerHardware.gametrakXMin);
     callable("gametrakXMax", boardcomputerHardware.gametrakXMax);
     callable("gametrakYMin", boardcomputerHardware.gametrakYMin);
     callable("gametrakYMax", boardcomputerHardware.gametrakYMax);
     callable("gametrakDistMin", boardcomputerHardware.gametrakDistMin);
     callable("gametrakDistMax", boardcomputerHardware.gametrakDistMax);
+#endif
     callable("swapScreenBytes", boardcomputerHardware.swapScreenBytes);
 
     callable("default.ctrlTyp", defaultMode.ctrlTyp);