diff --git a/mcp_server/src/services/factories.py b/mcp_server/src/services/factories.py
index 02f19e35d..c431adcd3 100644
--- a/mcp_server/src/services/factories.py
+++ b/mcp_server/src/services/factories.py
@@ -419,6 +419,7 @@ def create_config(config: DatabaseConfig) -> dict:
 
                 uri = os.environ.get('FALKORDB_URI', falkor_config.uri)
                 password = os.environ.get('FALKORDB_PASSWORD', falkor_config.password)
+                database = os.environ.get('FALKORDB_DATABASE', falkor_config.database)
 
                 # Parse the URI to extract host and port
                 parsed = urlparse(uri)
@@ -430,7 +431,7 @@ def create_config(config: DatabaseConfig) -> dict:
                     'host': host,
                     'port': port,
                     'password': password,
-                    'database': falkor_config.database,
+                    'database': database,
                 }
 
             case _: