diff --git a/CHANGELOG.md b/CHANGELOG.md
index 556de7535..28281e6e3 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Fixed stacks not splitting between storages correctly
 - Fixed storage not saving ItemStack capabilities
 - Fixed dropping items into crafting grid with mouse won't work if your mouse is in between items
+- Fixed controller still drawing power even if disabled
 
 **Features**
 - Added an API
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index fbda7369f..2ca7e324d 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -121,8 +121,11 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
                         craftingTasks.pop();
                     }
                 }
-            } else {
+            } else if (!machines.isEmpty()) {
+                // Machine list should NOT be empty to trigger a disconnect
+                // We need to sync machines again to reset energy usage etc
                 disconnectAll();
+                syncMachines();
             }
 
             if (couldRun != mayRun()) {