diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee0bfb332..084c5e746 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 1.5.18
 - Added Project E integration for the External Storage on the Transmutation Table (raoulvdberge)
 - Added Project E integration for the energy values of Solderer items (raoulvdberge)
+- Fixed network not disconnecting when Controller is broken (raoulvdberge)
 
 ### 1.5.17
 - Re-added support for OpenComputers (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
index 6319bd374..484443921 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -266,6 +266,15 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
         return networkItemHandler;
     }
 
+    @Override
+    public void invalidate() {
+        super.invalidate();
+
+        if (world != null && !world.isRemote) {
+            nodeGraph.disconnectAll();
+        }
+    }
+
     @Override
     public IStorageCache<ItemStack> getItemStorageCache() {
         return itemStorage;