diff --git a/core/src/apps/management/change_pin.py b/core/src/apps/management/change_pin.py
index a5947b6cb0..6f482342b5 100644
--- a/core/src/apps/management/change_pin.py
+++ b/core/src/apps/management/change_pin.py
@@ -58,3 +58,6 @@ def require_confirm_change_pin(ctx: wire.Context, msg: ChangePin) -> None:
         text.normal("Do you really want to")
         text.bold("enable PIN protection?")
         return require_confirm(ctx, text)
+
+    # removing non-existing PIN
+    raise wire.ProcessError("PIN protection already disabled")