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 eba2bda568..f8cc93a677 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
@@ -307,6 +307,7 @@ public void run() {
                         DatasetWrapper dw = getDatasetWrapper();
                         try {
                             isRebuildGraphURICacheRunning = true;
+                            rebuildGraphURICache = false;
                             Dataset d = dw.getDataset();
                             Set<String> newURIs = new HashSet<>();
                             d.begin(ReadWrite.READ);
@@ -324,7 +325,6 @@ public void run() {
                         } finally {
                             isRebuildGraphURICacheRunning = false;
                             dw.close();
-                            rebuildGraphURICache = false;
                         }
                     }
                 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
index 5457c64e2e..ed8767c559 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
@@ -378,6 +378,7 @@ public void run() {
                     if (rebuildGraphURICache) {
                         try {
                             isRebuildGraphURICacheRunning = true;
+                            rebuildGraphURICache = false;
                             Set<String> newURIs = new HashSet<>();
                             try {
                                 String fastJenaQuery = "SELECT DISTINCT ?g WHERE { GRAPH ?g {} } ORDER BY ?g";
@@ -394,7 +395,6 @@ public void run() {
                             log.error(e, e);
                         } finally {
                             isRebuildGraphURICacheRunning = false;
-                            rebuildGraphURICache = false;
                         }
                     }
                 }