diff --git a/pr_agent/cli.py b/pr_agent/cli.py
index ef161437..13058971 100644
--- a/pr_agent/cli.py
+++ b/pr_agent/cli.py
@@ -86,7 +86,9 @@ def run(inargs=None, args=None):
         if get_settings().litellm.get("enable_callbacks", False):
             # There may be additional events on the event queue from the run above. If there are give them time to complete.
             get_logger().debug("Waiting for event queue to complete")
-            await asyncio.wait([task for task in asyncio.all_tasks() if task is not asyncio.current_task()])
+            tasks = [task for task in asyncio.all_tasks() if task is not asyncio.current_task()]
+            if tasks:
+                await asyncio.wait(tasks, timeout=30)
 
         return result