diff --git a/python/src/trezorlib/debuglink.py b/python/src/trezorlib/debuglink.py
index 222f962e35..0067d644c1 100644
--- a/python/src/trezorlib/debuglink.py
+++ b/python/src/trezorlib/debuglink.py
@@ -446,8 +446,6 @@ class DebugLink:
 
         self.waiting_for_layout_change = False
 
-        self.input_wait_type = DebugWaitType.IMMEDIATE
-
     @property
     def legacy_ui(self) -> bool:
         """Differences between UI1 and UI2."""
diff --git a/tests/device_handler.py b/tests/device_handler.py
index 4df01f9c84..605b160c98 100644
--- a/tests/device_handler.py
+++ b/tests/device_handler.py
@@ -6,7 +6,6 @@ from concurrent.futures import ThreadPoolExecutor
 import typing_extensions as tx
 
 from trezorlib.client import PASSPHRASE_ON_DEVICE
-from trezorlib.messages import DebugWaitType
 from trezorlib.transport import udp
 
 if t.TYPE_CHECKING:
@@ -50,7 +49,6 @@ class BackgroundDeviceHandler:
         self.client = client
         self.client.ui = NullUI  # type: ignore [NullUI is OK UI]
         self.client.watch_layout(True)
-        self.client.debug.input_wait_type = DebugWaitType.CURRENT_LAYOUT
 
     def run_with_session(
         self,