diff --git a/src/python/src/openapi_server/infrastructure/database/database.py b/src/python/src/openapi_server/infrastructure/database/database.py
index 295824c9..7de54f48 100644
--- a/src/python/src/openapi_server/infrastructure/database/database.py
+++ b/src/python/src/openapi_server/infrastructure/database/database.py
@@ -76,4 +76,9 @@ async def my_endpoint(session: AsyncSession = Depends(db_manager.get_session)):
                 pass
         """
         async with self.async_session_factory() as session:
-            yield session
+            try:
+                yield session
+                await session.commit()
+            except Exception:
+                await session.rollback()
+                raise