diff --git a/core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalog.java b/core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalog.java
index 5fb80d948e..e128d3e47a 100644
--- a/core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalog.java
+++ b/core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalog.java
@@ -267,11 +267,21 @@ public static void setDegreeDistribution(
     }
 
     public static void removeAllLoadedGraphs() {
-        userCatalogs.clear();
+        userCatalogs.forEach((username, userCatalog) -> {
+            userCatalog.graphsByName.forEach(((userCatalogKey, graphStoreCatalogEntry) -> {
+                userCatalog.remove(userCatalogKey, __ -> {}, false);
+            }));
+        });
     }
 
     public static void removeAllLoadedGraphs(DatabaseId databaseId) {
-        userCatalogs.forEach((user, userCatalog) -> userCatalog.remove(databaseId.databaseName()));
+        userCatalogs.forEach((user, userCatalog) -> {
+            userCatalog.graphsByName.forEach(((userCatalogKey, graphStoreCatalogEntry) -> {
+                if (databaseId.databaseName().equals(userCatalogKey.databaseName())) {
+                    userCatalog.remove(userCatalogKey, __ -> {}, false);
+                }
+            }));
+        });
     }
 
     public static Collection<GraphStoreCatalogEntry> getGraphStores(String username) {
@@ -430,10 +440,6 @@ private boolean remove(
                 .orElse(Boolean.FALSE);
         }
 
-        private void remove(String databaseName) {
-            graphsByName.keySet().removeIf(userCatalogKey -> userCatalogKey.databaseName().equals(databaseName));
-        }
-
         private Stream<GraphStoreCatalogEntryWithUsername> streamGraphStores(String userName) {
             return graphsByName
                 .values()