diff --git a/tests/conftest.py b/tests/conftest.py
index d1b17c11c..d2093e2f2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -231,6 +231,7 @@ def client(
     _raw_client.reset_debug_features()
     _raw_client.open()
     try:
+        _raw_client.sync_responses()
         _raw_client.init_device()
     except Exception:
         request.session.shouldstop = "Failed to communicate with Trezor"
diff --git a/tests/ui_tests/__init__.py b/tests/ui_tests/__init__.py
index a6fb01349..c7ab04a45 100644
--- a/tests/ui_tests/__init__.py
+++ b/tests/ui_tests/__init__.py
@@ -61,6 +61,7 @@ def screen_recording(
         yield
     finally:
         client.ensure_open()
+        client.sync_responses()
         # Wait for response to Initialize, which gives the emulator time to catch up
         # and redraw the homescreen. Otherwise there's a race condition between that
         # and stopping recording.