diff --git a/platform-service/src/unstract/platform_service/run.py b/platform-service/src/unstract/platform_service/run.py
index ae7f9e1a4..403c739a4 100644
--- a/platform-service/src/unstract/platform_service/run.py
+++ b/platform-service/src/unstract/platform_service/run.py
@@ -1,4 +1,5 @@
 from logging.config import dictConfig
+from typing import Any
 
 from dotenv import load_dotenv
 from flask import Flask
@@ -43,6 +44,13 @@ def before_request() -> None:
         be_db.connect(reuse_if_open=True)
 
 
+@app.teardown_request
+def after_request(exception: Any) -> None:
+    # Close the connection after each request
+    if not be_db.is_closed():
+        be_db.close()
+
+
 if __name__ == "__main__":
     # Start the server
     app.run(host="0.0.0.0", port=3001, load_dotenv=True)
diff --git a/prompt-service/src/unstract/prompt_service/main.py b/prompt-service/src/unstract/prompt_service/main.py
index b92fb0076..8d4bfafe8 100644
--- a/prompt-service/src/unstract/prompt_service/main.py
+++ b/prompt-service/src/unstract/prompt_service/main.py
@@ -54,6 +54,13 @@ def before_request() -> None:
         db.connect(reuse_if_open=True)
 
 
+@app.teardown_request
+def after_request(exception: Any) -> None:
+    # Close the connection after each request
+    if not db.is_closed():
+        db.close()
+
+
 def _publish_log(
     log_events_id: str,
     component: dict[str, str],