2 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
index a8ddfa9114..dfec0bf7a4 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
@@ -188,6 +188,11 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
     void onRemoval();
 
     /**
+     * Called when the BaseMetaTileEntity gets unloaded
+     */
+    default void onChunkUnload() {}
+
+    /**
      * @param facing the facing direction to check
      * @return if aFacing would be a valid Facing for this Device. Used for wrenching.
      */
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 8755bacf7f..4390250dcf 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -987,6 +987,10 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
     @Override
     public void onChunkUnload() {
+        if (canAccessData()) {
+            mMetaTileEntity.onChunkUnload();
+        }
+
         super.onChunkUnload();
         onChunkUnloadAE();
     }