diff --git a/CHANGELOG.md b/CHANGELOG.md
index f114dc1d7..e88df4e01 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 1.8.7
 - Fixed Regulator mode item and fluid counts not saving properly (raoulvdberge)
 - Fixed Wireless Crafting Monitor not closing properly (raoulvdberge)
+- Fixed Controller always using energy, even when disabled with redstone (raoulvdberge)
 
 ### 1.8.6
 - Fixed Constructor duplication bug (Darkere)
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
index 3c9fc453f..ac4dbd17b 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
@@ -525,7 +525,12 @@ public class Network implements INetwork, IRedstoneConfigurable {
     }
 
     private void updateEnergyUsage() {
-        int usage = redstoneMode.isEnabled(world, pos) ? RS.SERVER_CONFIG.getController().getBaseUsage() : 0;
+        if (!redstoneMode.isEnabled(world, pos)) {
+            this.lastEnergyUsage = 0;
+            return;
+        }
+
+        int usage = RS.SERVER_CONFIG.getController().getBaseUsage();
 
         for (INetworkNode node : nodeGraph.all()) {
             if (node.isActive()) {