diff --git a/metadata-ingestion/src/datahub/upgrade/upgrade.py b/metadata-ingestion/src/datahub/upgrade/upgrade.py
index 32c5528487..a8a2ef2605 100644
--- a/metadata-ingestion/src/datahub/upgrade/upgrade.py
+++ b/metadata-ingestion/src/datahub/upgrade/upgrade.py
@@ -163,22 +163,14 @@ async def retrieve_version_stats(
     client_version_stats_future = asyncio.ensure_future(get_client_version_stats())
     github_stats_future = asyncio.ensure_future(get_github_stats())
     server_config_future = asyncio.ensure_future(get_server_version_stats(server))
-    tasks = [client_version_stats_future, github_stats_future, server_config_future]
 
-    while len(tasks):
-        done, pending = await asyncio.wait(tasks, timeout=0.1)
-        for t in done:
-            if t == client_version_stats_future:
-                client_version_stats = t.result()
-            elif t == github_stats_future:
-                (last_server_version, last_server_date) = t.result()
-            elif t == server_config_future:
-                (
-                    current_server_type,
-                    current_server_version,
-                    current_server_release_date,
-                ) = server_config_future.result()
-            tasks.remove(t)
+    client_version_stats = await client_version_stats_future
+    (last_server_version, last_server_date) = await github_stats_future
+    (
+        current_server_type,
+        current_server_version,
+        current_server_release_date,
+    ) = await server_config_future
 
     server_version_stats = None
     if current_server_version: