diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
index 986295a0a..ba6704548 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
@@ -533,19 +533,18 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
         if (rebuildGraphURICache) {
             synchronized (RDFServiceJena.class) {
                 if (rebuildGraphURICache) {
-                    rebuildGraphURICache = false;
-                    graphURIs.clear();
-
                     DatasetWrapper dw = getDatasetWrapper();
                     try {
                         Dataset d = dw.getDataset();
                         Iterator<String> nameIt = d.listNames();
+                        graphURIs.clear();
                         while (nameIt.hasNext()) {
                             graphURIs.add(nameIt.next());
                         }
                         return graphURIs;
                     } finally {
                         dw.close();
+                        rebuildGraphURICache = false;
                     }
                 }
             }