diff --git a/radio/src/io/frsky_firmware_update.cpp b/radio/src/io/frsky_firmware_update.cpp
index a6247790a..fd940d399 100644
--- a/radio/src/io/frsky_firmware_update.cpp
+++ b/radio/src/io/frsky_firmware_update.cpp
@@ -798,8 +798,10 @@ const char * FrskyChipFirmwareUpdate::flashFirmware(const char * filename, Progr
   INTERNAL_MODULE_OFF();
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   uint8_t extPwr = IS_EXTERNAL_MODULE_ON();
   EXTERNAL_MODULE_OFF();
+#endif
 
 #if defined(SPORT_UPDATE_PWR_GPIO)
   uint8_t spuPwr = IS_SPORT_UPDATE_POWER_ON();
diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h
index 350f18304..c5b1efd4c 100644
--- a/radio/src/pulses/modules_helpers.h
+++ b/radio/src/pulses/modules_helpers.h
@@ -797,13 +797,14 @@ inline void resetAccessAuthenticationCount()
 
 inline void resetAfhdsOptions(uint8_t moduleIdx)
 {
-  auto & data = g_model.moduleData[moduleIdx];
 #if defined(AFHDS3)
+  auto & data = g_model.moduleData[moduleIdx];
   data.subType = FLYSKY_SUBTYPE_AFHDS3;
   data.afhds3.emi = 2; // FCC
   data.afhds3.telemetry = 1;
   data.afhds3.phyMode = 0;
 #elif defined(AFHDS2A)
+  auto & data = g_model.moduleData[moduleIdx];
   data.subType = FLYSKY_SUBTYPE_AFHDS2A;
   data.flysky.setDefault();
 #endif
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 075671d0e..809cf64e3 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -258,11 +258,15 @@ static inline void pollExtTelemetryLegacy()
 //   - telemetry polling needs to happen for each enabled module
 void telemetryWakeup()
 {
+#if defined(HARDWARE_INTERNAL_MODULE)
   auto int_drv = getIntModuleDriver();
   if (int_drv) pollTelemetry(INTERNAL_MODULE, int_drv, getIntModuleCtx());
+#endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   auto ext_drv = getExtModuleDriver();
   if (ext_drv) pollTelemetry(EXTERNAL_MODULE, ext_drv, getExtModuleCtx());
+#endif
                              
   // TODO: needs to be moved to protocol/module init
   //       as-is, it implies only ONE telemetry protocol