diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py
index 4d489c415..30420b1d6 100644
--- a/tests/rpc/test_rpc_telegram.py
+++ b/tests/rpc/test_rpc_telegram.py
@@ -78,18 +78,18 @@ def update():
 
 
 def patch_eventloop_threading(telegrambot):
-    is_init = False
+    init_event = threading.Event()
 
     def thread_fuck():
-        nonlocal is_init
         telegrambot._loop = asyncio.new_event_loop()
-        is_init = True
+        init_event.set()
         telegrambot._loop.run_forever()
 
     x = threading.Thread(target=thread_fuck, daemon=True)
     x.start()
-    while not is_init:
-        pass
+    # Wait for thread to be properly initialized with timeout
+    if not init_event.wait(timeout=5.0):
+        raise RuntimeError("Failed to initialize event loop thread")
 
 
 class DummyCls(Telegram):