diff --git a/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h b/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h
index beb91fc495..c79d56812c 100644
--- a/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h
+++ b/core/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h
@@ -44,7 +44,7 @@ typedef struct _mp_obj_HDNode_t {
 STATIC const mp_obj_type_t mod_trezorcrypto_HDNode_type;
 
 #define XPUB_MAXLEN 128
-#define ADDRESS_MAXLEN 36
+#define ADDRESS_MAXLEN 40
 
 /// def __init__(
 ///     self,
diff --git a/tests/device_tests/test_msg_getaddress.py b/tests/device_tests/test_msg_getaddress.py
index 047195a3a4..cf16cc9438 100644
--- a/tests/device_tests/test_msg_getaddress.py
+++ b/tests/device_tests/test_msg_getaddress.py
@@ -238,3 +238,12 @@ def test_unknown_path(client):
         )
         # account number is too high
         btc.get_address(client, "Bitcoin", parse_path("m/44'/0'/21'/0/0"))
+
+
+@pytest.mark.altcoin
+@pytest.mark.skip_ui
+def test_crw(client):
+    assert (
+        btc.get_address(client, "Crown", parse_path("44'/72'/0'/0/0"))
+        == "CRWYdvZM1yXMKQxeN3hRsAbwa7drfvTwys48"
+    )