diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
index ac4fc2d3a..d6bc63fba 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
@@ -190,8 +190,8 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA
     @Override
     public boolean equals(Object o) {
         return o instanceof NetworkNode
-                && holder.pos().equals(((NetworkNode) o).holder.pos())
-                && holder.world().provider.getDimension() == ((NetworkNode) o).holder.world().provider.getDimension();
+            && holder.pos().equals(((NetworkNode) o).holder.pos())
+            && holder.world().provider.getDimension() == ((NetworkNode) o).holder.world().provider.getDimension();
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
index 8e50242b3..1f4d6649a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.tile;
 
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
 import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
 import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy;
 import com.raoulvdberge.refinedstorage.api.util.IWrenchable;
@@ -44,18 +43,7 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
             getNode().update();
         }
 
-        if (getNode().getHolder().world() != null) {
-            super.update();
-        }
-    }
-
-    @Override
-    public void onLoad() {
-        super.onLoad();
-
-        if (getNode().getHolder().world() == null) {
-            getNode().setHolder(this);
-        }
+        super.update();
     }
 
     @Override
@@ -122,12 +110,16 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
     public N getNode() {
         INetworkNodeManager manager = API.instance().getNetworkNodeManager(getWorld().provider.getDimension());
 
-        INetworkNode node = manager.getNode(pos);
+        NetworkNode node = (NetworkNode) manager.getNode(pos);
 
         if (node == null) {
             manager.setNode(pos, node = createNode());
         }
 
+        if (node.getHolder().world() == null) {
+            node.setHolder(this);
+        }
+
         return (N) node;
     }