diff --git a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java
index 78b1ab5fc..31c0e29af 100644
--- a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java
+++ b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java
@@ -291,6 +291,14 @@ public class ResourceLoader<T extends IrisRegistrant> {
 
         lock.unlock();
 
+        if(folderCache == null)
+        {
+            synchronized (this)
+            {
+                return getFolderCache();
+            }
+        }
+
         return folderCache;
     }