diff --git a/cognee/context_global_variables.py b/cognee/context_global_variables.py
index 58fff2dff..6417f34f7 100644
--- a/cognee/context_global_variables.py
+++ b/cognee/context_global_variables.py
@@ -121,6 +121,8 @@ async def set_database_global_context_variables(dataset: Union[str, UUID], user_
     )
 
     # Set vector and graph database configuration based on dataset database information
+    # TODO: Add better handling of vector and graph config accross Cognee.
+    #  LRU_CACHE takes into account order of inputs, if order of inputs is changed it will be registered as a new DB adapter
     vector_config = {
         "vector_db_provider": dataset_database.vector_database_provider,
         "vector_db_url": dataset_database.vector_database_url,
@@ -142,6 +144,8 @@ async def set_database_global_context_variables(dataset: Union[str, UUID], user_
         "graph_database_password": dataset_database.graph_database_connection_info.get(
             "graph_database_password", ""
         ),
+        "graph_dataset_database_handler": "",
+        "graph_database_port": "",
     }
 
     storage_config = {
diff --git a/cognee/infrastructure/databases/graph/kuzu/KuzuDatasetDatabaseHandler.py b/cognee/infrastructure/databases/graph/kuzu/KuzuDatasetDatabaseHandler.py
index 6eb3ed0f4..edc6d5c39 100644
--- a/cognee/infrastructure/databases/graph/kuzu/KuzuDatasetDatabaseHandler.py
+++ b/cognee/infrastructure/databases/graph/kuzu/KuzuDatasetDatabaseHandler.py
@@ -6,7 +6,6 @@ from cognee.infrastructure.databases.graph.get_graph_engine import create_graph_
 from cognee.base_config import get_base_config
 from cognee.modules.users.models import User
 from cognee.modules.users.models import DatasetDatabase
-from cognee.infrastructure.databases.graph.config import get_graph_config
 from cognee.infrastructure.databases.dataset_database_handler import DatasetDatabaseHandlerInterface
 
 
@@ -56,7 +55,6 @@ class KuzuDatasetDatabaseHandler(DatasetDatabaseHandlerInterface):
 
     @classmethod
     async def delete_dataset(cls, dataset_database: DatasetDatabase):
-        graph_config = get_graph_config()
         base_config = get_base_config()
         databases_directory_path = os.path.join(
             base_config.system_root_directory, "databases", str(dataset_database.owner_id)
@@ -66,16 +64,17 @@ class KuzuDatasetDatabaseHandler(DatasetDatabaseHandlerInterface):
         )
         graph_engine = create_graph_engine(
             graph_database_provider=dataset_database.graph_database_provider,
-            graph_file_path=graph_file_path,
             graph_database_url=dataset_database.graph_database_url,
             graph_database_name=dataset_database.graph_database_name,
+            graph_database_key=dataset_database.graph_database_key,
+            graph_file_path=graph_file_path,
             graph_database_username=dataset_database.graph_database_connection_info.get(
                 "graph_database_username", ""
             ),
             graph_database_password=dataset_database.graph_database_connection_info.get(
                 "graph_database_password", ""
             ),
-            graph_database_port=graph_config.graph_database_port,
-            graph_database_key=dataset_database.graph_database_key,
+            graph_dataset_database_handler="",
+            graph_database_port="",
         )
         await graph_engine.delete_graph()
diff --git a/cognee/infrastructure/databases/vector/lancedb/LanceDBDatasetDatabaseHandler.py b/cognee/infrastructure/databases/vector/lancedb/LanceDBDatasetDatabaseHandler.py
index 6d14b11bc..f165a7ea4 100644
--- a/cognee/infrastructure/databases/vector/lancedb/LanceDBDatasetDatabaseHandler.py
+++ b/cognee/infrastructure/databases/vector/lancedb/LanceDBDatasetDatabaseHandler.py
@@ -32,21 +32,18 @@ class LanceDBDatasetDatabaseHandler(DatasetDatabaseHandlerInterface):
         vector_db_name = f"{dataset_id}.lance.db"
 
         return {
-            "vector_database_name": vector_db_name,
-            "vector_database_url": os.path.join(databases_directory_path, vector_db_name),
             "vector_database_provider": vector_config.vector_db_provider,
+            "vector_database_url": os.path.join(databases_directory_path, vector_db_name),
             "vector_database_key": vector_config.vector_db_key,
+            "vector_database_name": vector_db_name,
         }
 
     @classmethod
     async def delete_dataset(cls, dataset_database: DatasetDatabase):
-        vector_config = get_vectordb_config()
         vector_engine = create_vector_engine(
             vector_db_provider=dataset_database.vector_database_provider,
             vector_db_url=dataset_database.vector_database_url,
-            vector_db_name=dataset_database.vector_database_name,
-            vector_db_port=vector_config.vector_db_port,
             vector_db_key=dataset_database.vector_database_key,
-            vector_dataset_database_handler=vector_config.vector_dataset_database_handler,
+            vector_db_name=dataset_database.vector_database_name,
         )
         await vector_engine.prune()