diff --git a/data/database.py b/data/database.py
index c30225e50..b10df6bc1 100644
--- a/data/database.py
+++ b/data/database.py
@@ -282,6 +282,8 @@ def _db_from_url(url, db_kwargs, connect_timeout=DEFAULT_DB_CONNECT_TIMEOUT):
                 parsed_url.drivername, db_kwargs['stale_timeout'], db_kwargs['max_connections'])
   else:
     logger.info('Connection pooling disabled for %s', parsed_url.drivername)
+    db_kwargs.pop('stale_timeout', None)
+    db_kwargs.pop('max_connections', None)
 
   wrapped_driver = _wrap_for_retry(driver)
   return wrapped_driver(parsed_url.database, **db_kwargs)