diff --git a/common/protob/pb2py b/common/protob/pb2py
index 09feef39c8..8b8196df45 100755
--- a/common/protob/pb2py
+++ b/common/protob/pb2py
@@ -327,6 +327,8 @@ class Descriptor:
         if msg_id is None:
             msg_id = self.message_types.get(message.name)
 
+        unstable = self._get_extension(message, "unstable")
+
         # "from .. import protobuf as p"
         yield self.protobuf_import + " as p"
 
@@ -358,6 +360,9 @@ class Descriptor:
         if msg_id is not None:
             yield "    MESSAGE_WIRE_TYPE = {}".format(msg_id)
 
+        if unstable is not None:
+            yield "    UNSTABLE = True"
+
         if fields:
             yield ""
             yield from self.create_init_method(fields)
diff --git a/core/src/trezor/messages/AuthorizeCoinJoin.py b/core/src/trezor/messages/AuthorizeCoinJoin.py
index d0c0995ef8..d1959a1aba 100644
--- a/core/src/trezor/messages/AuthorizeCoinJoin.py
+++ b/core/src/trezor/messages/AuthorizeCoinJoin.py
@@ -13,6 +13,7 @@ if __debug__:
 
 class AuthorizeCoinJoin(p.MessageType):
     MESSAGE_WIRE_TYPE = 51
+    UNSTABLE = True
 
     def __init__(
         self,
diff --git a/python/src/trezorlib/messages/AuthorizeCoinJoin.py b/python/src/trezorlib/messages/AuthorizeCoinJoin.py
index c27daf9520..f9c9e7a9e9 100644
--- a/python/src/trezorlib/messages/AuthorizeCoinJoin.py
+++ b/python/src/trezorlib/messages/AuthorizeCoinJoin.py
@@ -13,6 +13,7 @@ if __debug__:
 
 class AuthorizeCoinJoin(p.MessageType):
     MESSAGE_WIRE_TYPE = 51
+    UNSTABLE = True
 
     def __init__(
         self,