diff --git a/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java b/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java
index 82e365129..0c8c60c5e 100644
--- a/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java
@@ -100,7 +100,13 @@ public class IrisEngineSVC implements IrisService {
                     Engine engine = supplier.get();
                     if (engine != null) {
                         long unloadStart = System.currentTimeMillis();
-                        int count = engine.getMantle().unloadTectonicPlate(tectonicLimit.get() / lastUse.size());
+                        int count = 0;
+                        if (!lastUse.isEmpty()){
+                             count = engine.getMantle().unloadTectonicPlate(tectonicLimit.get() / lastUse.size());
+                        } else {
+                             count = engine.getMantle().unloadTectonicPlate(tectonicLimit.get());
+                        }
+
                         if (count > 0) {
                             Iris.debug(C.GOLD + "Unloaded " +  C.YELLOW + count + " TectonicPlates in " + C.RED + Form.duration(System.currentTimeMillis() - unloadStart, 2));
                         }
diff --git a/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
index f5698455b..0634d488a 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
@@ -446,7 +446,7 @@ public class Mantle {
 
     public int unloadTectonicPlate(int tectonicLimit) {
         // todo: make a advanced unloader
-        if (toUnload.size() > tectonicLimit){
+        if (toUnload.size() > tectonicLimit / lastUse.size()){
             dynamicThreads.set(2);
         }
         AtomicInteger i = new AtomicInteger();