diff --git a/core/src/trezor/wire/message_handler.py b/core/src/trezor/wire/message_handler.py
index c0f201de22..1fa038db67 100644
--- a/core/src/trezor/wire/message_handler.py
+++ b/core/src/trezor/wire/message_handler.py
@@ -126,14 +126,7 @@ async def handle_single_message(ctx: Context, msg: Message) -> bool:
         # Find a protobuf.MessageType subclass that describes this
         # message.  Raises if the type is not found.
 
-        if utils.USE_THP:
-            name = get_msg_name(msg.type)
-            if name is None:
-                req_type = protobuf.type_for_wire(msg.type)
-            else:
-                req_type = protobuf.type_for_name(name)
-        else:
-            req_type = protobuf.type_for_wire(msg.type)
+        req_type = protobuf.type_for_wire(msg.type)
 
         # Try to decode the message according to schema from
         # `req_type`. Raises if the message is malformed.