diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c8d7ee15..df388d7d2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined S
 - Fixed using Interfaces for minimum stock levels failing when requester is also an Interface (raoulvdberge)
 - Fixed ItemZoom incompatibility in Grid and crafting preview window (raoulvdberge)
 - Fixed shift clicking upgrades into Interface making upgrades go to import slots (raoulvdberge)
+- Fixed duplication glitch with storages (raoulvdberge)
 - Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge)
 - Added a missing config option for Crafter Manager energy usage (raoulvdberge)
 - Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java
index 9b00afb2d..c043405e7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java
@@ -35,14 +35,6 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
 
     @Override
     public void rebuild() {
-        if (!controller.canRun()) {
-            if (!nodes.isEmpty()) {
-                disconnectAll();
-            }
-
-            return;
-        }
-
         rebuilding = true;
 
         Operator operator = new Operator();
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 16f6e2b53..b8ae342b0 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
@@ -99,7 +99,13 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
 
     @Override
     public boolean canUpdate() {
-        return redstoneMode.isEnabled(world, pos);
+        if (redstoneMode.isEnabled(world, pos)) {
+            if (network != null) {
+                return network.canRun();
+            }
+        }
+
+        return false;
     }
 
     protected int getUpdateThrottleInactiveToActive() {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
index 74ee6a42d..32e30c3ee 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
@@ -86,7 +86,7 @@ public class TileDiskDrive extends TileNode<NetworkNodeDiskDrive> {
     public NBTTagCompound writeUpdate(NBTTagCompound tag) {
         super.writeUpdate(tag);
 
-        writeDiskState(tag, 8, getNode().getNetwork() != null, getNode().getItemDisks(), getNode().getFluidDisks());
+        writeDiskState(tag, 8, getNode().getNetwork() != null && getNode().canUpdate(), getNode().getItemDisks(), getNode().getFluidDisks());
 
         return tag;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
index a207ae365..c0790d7f9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
@@ -40,7 +40,7 @@ public class TileDiskManipulator extends TileNode<NetworkNodeDiskManipulator> {
     public NBTTagCompound writeUpdate(NBTTagCompound tag) {
         super.writeUpdate(tag);
 
-        TileDiskDrive.writeDiskState(tag, 6, getNode().getNetwork() != null, getNode().getItemDisks(), getNode().getFluidDisks());
+        TileDiskDrive.writeDiskState(tag, 6, getNode().getNetwork() != null && getNode().canUpdate(), getNode().getItemDisks(), getNode().getFluidDisks());
 
         return tag;
     }