diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java
index 26cac7e84..4cb6162b2 100644
--- a/src/main/java/appeng/me/cache/CraftingGridCache.java
+++ b/src/main/java/appeng/me/cache/CraftingGridCache.java
@@ -96,7 +96,11 @@ public class CraftingGridCache
             nextDetail) -> nextDetail.getPriority() - firstDetail.getPriority();
 
     static {
-        final ThreadFactory factory = ar -> new Thread(ar, "AE Crafting Calculator");
+        final ThreadFactory factory = ar -> {
+            final Thread crafting = new Thread(ar, "AE Crafting Calculator");
+            crafting.setDaemon(true);
+            return crafting;
+        };
 
         CRAFTING_POOL = Executors.newCachedThreadPool(factory);
     }
diff --git a/src/main/java/appeng/services/compass/CompassThreadFactory.java b/src/main/java/appeng/services/compass/CompassThreadFactory.java
index 39e43906f..e003db622 100644
--- a/src/main/java/appeng/services/compass/CompassThreadFactory.java
+++ b/src/main/java/appeng/services/compass/CompassThreadFactory.java
@@ -33,7 +33,9 @@ public final class CompassThreadFactory implements ThreadFactory {
     @Override
     public Thread newThread(@Nonnull final Runnable job) {
         Preconditions.checkNotNull(job);
+        final Thread compass = new Thread(job, "AE Compass Service");
+        compass.setDaemon(true);
 
-        return new Thread(job, "AE Compass Service");
+        return compass;
     }
 }