diff --git a/common/protob/messages.proto b/common/protob/messages.proto
index 28e942599..c1718d3bd 100644
--- a/common/protob/messages.proto
+++ b/common/protob/messages.proto
@@ -516,9 +516,6 @@ enum MessageType {
     MessageType_LnurlAuth = 11600 [(wire_in) = true];
     MessageType_LnurlAuthResp = 11601 [(wire_out) = true];
 
-    // Uniform Resources [21000:22000]
-    MessageType_URCryptoHdkey = 21000 [(wire_in) = true];
-    MessageType_URResponse = 21001 [(wire_out) = true];
 
     // nervos
     MessageType_NervosGetAddress = 11701 [(wire_in) = true];
diff --git a/core/src/apps/workflow_handlers.py b/core/src/apps/workflow_handlers.py
index 82626058b..1c1bd2c2c 100644
--- a/core/src/apps/workflow_handlers.py
+++ b/core/src/apps/workflow_handlers.py
@@ -364,10 +364,6 @@ def find_message_handler_module(msg_type: int) -> str:
         if msg_type == MessageType.AlephiumSignMessage:
             return "apps.alephium.sign_message"
 
-        # UR
-        if msg_type == MessageType.URCryptoHdkey:
-            return "apps.ur_registry.crypto_hd_key"
-
     raise ValueError
 
 
diff --git a/core/src/trezor/enums/MessageType.py b/core/src/trezor/enums/MessageType.py
index 6dd3769d3..00657d3ec 100644
--- a/core/src/trezor/enums/MessageType.py
+++ b/core/src/trezor/enums/MessageType.py
@@ -355,8 +355,6 @@
     NostrSignedSchnorr = 11509
     LnurlAuth = 11600
     LnurlAuthResp = 11601
-    URCryptoHdkey = 21000
-    URResponse = 21001
     NervosGetAddress = 11701
     NervosAddress = 11702
     NervosSignTx = 11703
diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py
index c85d4e755..eee590530 100644
--- a/core/src/trezor/enums/__init__.py
+++ b/core/src/trezor/enums/__init__.py
@@ -373,8 +373,6 @@ class MessageType(IntEnum):
         NostrSignedSchnorr = 11509
         LnurlAuth = 11600
         LnurlAuthResp = 11601
-        URCryptoHdkey = 21000
-        URResponse = 21001
         NervosGetAddress = 11701
         NervosAddress = 11702
         NervosSignTx = 11703
diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py
index cb90fc7e6..81c109261 100644
--- a/python/src/trezorlib/messages.py
+++ b/python/src/trezorlib/messages.py
@@ -381,8 +381,6 @@ class MessageType(IntEnum):
     NostrSignedSchnorr = 11509
     LnurlAuth = 11600
     LnurlAuthResp = 11601
-    URCryptoHdkey = 21000
-    URResponse = 21001
     NervosGetAddress = 11701
     NervosAddress = 11702
     NervosSignTx = 11703