diff --git a/agixt/DB.py b/agixt/DB.py
index 4691296e0158..63b712a62b44 100644
--- a/agixt/DB.py
+++ b/agixt/DB.py
@@ -36,7 +36,11 @@
         DATABASE_PASSWORD = getenv("DATABASE_PASSWORD")
         DATABASE_HOST = getenv("DATABASE_HOST")
         DATABASE_PORT = getenv("DATABASE_PORT")
-        LOGIN_URI = f"{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}"
+        DATABASE_SSL = getenv("DATABASE_SSL", "disable")
+        if DATABASE_SSL == "disable":
+            LOGIN_URI = f"{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}"
+        else:
+            LOGIN_URI = f"{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}?sslmode={DATABASE_SSL}"
         DATABASE_URI = f"postgresql://{LOGIN_URI}"
     else:
         DATABASE_URI = f"sqlite:///{DATABASE_NAME}.db"