diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 4ac6f8f46..15bcc1d2a 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -300,8 +300,6 @@ void Router::sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Rout
 
 bool perhapsDecode(meshtastic_MeshPacket *p)
 {
-    if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER)
-        return false;
 
     if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag)
         return true; // If packet was already decoded just return
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index b0e4bd2b1..e8481356b 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -78,11 +78,11 @@ void setupModules()
 #elif defined(ARCH_NRF52)
         externalNotificationModule = new ExternalNotificationModule();
 #endif
-
-        // NOTE! This module must be added LAST because it likes to check for replies from other modules and avoid sending extra
-        // acks
     } else {
         adminModule = new AdminModule();
+        traceRouteModule = new TraceRouteModule();
     }
+    // NOTE! This module must be added LAST because it likes to check for replies from other modules and avoid sending extra
+    // acks
     routingModule = new RoutingModule();
 }