diff --git a/edb/server/tenant.py b/edb/server/tenant.py
index ed02cc4557c..8a68b22f63d 100644
--- a/edb/server/tenant.py
+++ b/edb/server/tenant.py
@@ -856,7 +856,7 @@ async def ensure_database_not_connected(
         )
 
         rloop = retryloop.RetryLoop(
-            timeout=10.0,
+            timeout=30.0,
             ignore=errors.ExecutionError,
         )