diff --git a/sahara/db/sqlalchemy/api.py b/sahara/db/sqlalchemy/api.py
index 2d4cd46fac..979c5424bf 100644
--- a/sahara/db/sqlalchemy/api.py
+++ b/sahara/db/sqlalchemy/api.py
@@ -48,8 +48,12 @@ def _create_facade_lazily():
     if _FACADE is None:
         with _LOCK:
             if _FACADE is None:
+                # FIXME(amoralej): Remove autocommit=True (and ideally use of
+                # LegacyEngineFacade) asap since it's not compatible with
+                # SQLAlchemy 2.0.
                 _FACADE = db_session.EngineFacade.from_config(CONF,
-                                                              sqlite_fk=True)
+                                                              sqlite_fk=True,
+                                                              autocommit=True)
     return _FACADE