diff --git a/src/main/io/transponder_ir.c b/src/main/io/transponder_ir.c
index 76322c88e..a6511ddef 100644
--- a/src/main/io/transponder_ir.c
+++ b/src/main/io/transponder_ir.c
@@ -52,12 +52,7 @@ void pgResetFn_transponderConfig(transponderConfig_t *transponderConfig)
         .data = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0x0, 0x0, 0x0 }, // Note, this is NOT a valid transponder code, it's just for testing production hardware
         .ioTag = IO_TAG_NONE
     );
-    for (unsigned i = 0; i < TIMER_CHANNEL_COUNT; i++) {
-        if (TIMER_HARDWARE[i].usageFlags & TIM_USE_TRANSPONDER) {
-            transponderConfig->ioTag = TIMER_HARDWARE[i].tag;
-            break;
-        }
-    }
+    transponderConfig->ioTag = timerioTagGetByUsage(TIM_USE_TRANSPONDER, 0);
 }
 
 static bool transponderInitialised = false;