diff --git a/src/lfx/tests/unit/custom/custom_component/test_component_events.py b/src/lfx/tests/unit/custom/custom_component/test_component_events.py
index 6c5d89a735..fd9e64d2c4 100644
--- a/src/lfx/tests/unit/custom/custom_component/test_component_events.py
+++ b/src/lfx/tests/unit/custom/custom_component/test_component_events.py
@@ -200,8 +200,12 @@ async def test_component_logging():
     # Log a message
     await asyncio.to_thread(component.log, "Test log message")
 
-    # Get the event from the queue
-    event_id, event_data, _ = queue.get_nowait()
+    # Get the event from the queue with timeout to avoid race conditions
+    try:
+        event_id, event_data, _ = await asyncio.wait_for(queue.get(), timeout=5.0)
+    except asyncio.TimeoutError:
+        pytest.fail("Timeout waiting for log event in queue")
+
     event = event_data.decode("utf-8")
 
     assert "Test log message" in event