diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java
index 5d4f4dc6afb..a2c8eba612d 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java
@@ -80,16 +80,10 @@ public MetaTileEntityFluidHatch(ResourceLocation metaTileEntityId, int tier, boo
         super(metaTileEntityId, tier, isExportHatch);
         this.fluidTank = new HatchFluidTank(getInventorySize(), this, isExportHatch);
         this.workingEnabled = true;
-        initializeInventory();
-    }
-
-    @Override
-    protected void initializeInventory() {
-        super.initializeInventory();
-        if (!this.hasGhostCircuitInventory()) return;
-
-        this.circuitInventory = new GhostCircuitItemStackHandler(this);
-        this.circuitInventory.addNotifiableMetaTileEntity(this);
+        if (this.hasGhostCircuitInventory()) {
+            this.circuitInventory = new GhostCircuitItemStackHandler(this);
+            this.circuitInventory.addNotifiableMetaTileEntity(this);
+        }
     }
 
     @Override
@@ -380,13 +374,15 @@ private Consumer<List<ITextComponent>> getFluidAmountText(TankWidget tankWidget)
     @Override
     public void addToMultiBlock(MultiblockControllerBase controllerBase) {
         super.addToMultiBlock(controllerBase);
-        this.circuitInventory.addNotifiableMetaTileEntity(controllerBase);
+        if (hasGhostCircuitInventory())
+            this.circuitInventory.addNotifiableMetaTileEntity(controllerBase);
     }
 
     @Override
     public void removeFromMultiBlock(MultiblockControllerBase controllerBase) {
         super.removeFromMultiBlock(controllerBase);
-        this.circuitInventory.removeNotifiableMetaTileEntity(controllerBase);
+        if (hasGhostCircuitInventory())
+            this.circuitInventory.removeNotifiableMetaTileEntity(controllerBase);
     }
 
     @Override