diff --git a/Pipfile.lock b/Pipfile.lock
index 74045d7d26..882d57a1f6 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -568,7 +568,7 @@
         "trezor": {
             "editable": true,
             "git": "https://github.com/trezor/python-trezor",
-            "ref": "369b704f6bf60e510e1fcb03b021ff1866894459"
+            "ref": "master"
         },
         "typing-extensions": {
             "hashes": [
diff --git a/src/apps/wallet/sign_tx/helpers.py b/src/apps/wallet/sign_tx/helpers.py
index e8f6a42d9b..6d1f5143ee 100644
--- a/src/apps/wallet/sign_tx/helpers.py
+++ b/src/apps/wallet/sign_tx/helpers.py
@@ -87,6 +87,8 @@ def request_tx_extra_data(
     tx_req.details.request_index = None
     ack = yield tx_req
     tx_req.serialized = None
+    tx_req.details.extra_data_offset = None
+    tx_req.details.extra_data_len = None
     return ack.tx.extra_data