diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCacheManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCacheManager.java
index df2c1f29..f12767b9 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCacheManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCacheManager.java
@@ -50,6 +50,9 @@ public class ArbitraryDataCacheManager extends Thread {
         } catch (InterruptedException e) {
             // Fall through to exit thread
         }
+
+        // Clear queue before terminating thread
+        processResourceQueue();
     }
 
     public void shutdown() {