diff --git a/common/protob/messages-common.proto b/common/protob/messages-common.proto
index a11eaff209..4dd16add5b 100644
--- a/common/protob/messages-common.proto
+++ b/common/protob/messages-common.proto
@@ -39,8 +39,10 @@ message Failure {
         Failure_PinMismatch = 12;
         Failure_WipeCodeMismatch = 13;
         Failure_InvalidSession = 14;
-        Failure_ThpUnallocatedSession=15;
-        Failure_InvalidProtocol=16;
+        Failure_ThpUnallocatedSession = 15;
+        Failure_InvalidProtocol = 16;
+        Failure_BufferError = 17;
+        Failure_DeviceIsBusy = 18;
         Failure_FirmwareError = 99;
     }
 }
diff --git a/core/src/trezor/enums/FailureType.py b/core/src/trezor/enums/FailureType.py
index 883844307a..e95dcb803f 100644
--- a/core/src/trezor/enums/FailureType.py
+++ b/core/src/trezor/enums/FailureType.py
@@ -18,4 +18,6 @@ WipeCodeMismatch = 13
 InvalidSession = 14
 ThpUnallocatedSession = 15
 InvalidProtocol = 16
+BufferError = 17
+DeviceIsBusy = 18
 FirmwareError = 99
diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py
index f0ab5e5d55..9a7eb1fd5b 100644
--- a/core/src/trezor/enums/__init__.py
+++ b/core/src/trezor/enums/__init__.py
@@ -39,10 +39,10 @@ if TYPE_CHECKING:
         PinMismatch = 12
         WipeCodeMismatch = 13
         InvalidSession = 14
-        DeviceIsBusy = 15
-        ThpUnallocatedSession = 16
-        InvalidProtocol = 17
-        BufferError = 18
+        ThpUnallocatedSession = 15
+        InvalidProtocol = 16
+        BufferError = 17
+        DeviceIsBusy = 18
         FirmwareError = 99
 
     class ButtonRequestType(IntEnum):
diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py
index 86fd70dfd8..f299987fe2 100644
--- a/python/src/trezorlib/messages.py
+++ b/python/src/trezorlib/messages.py
@@ -45,6 +45,8 @@ class FailureType(IntEnum):
     InvalidSession = 14
     ThpUnallocatedSession = 15
     InvalidProtocol = 16
+    BufferError = 17
+    DeviceIsBusy = 18
     FirmwareError = 99