diff --git a/CHANGELOG.md b/CHANGELOG.md
index 996f97ba5..81b58ebf8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.3.5
+- Fixed Controller not using energy (raoulvdberge)
+
 ### 1.3.4
 - Added option to check for oredict in the Grid Filter (raoulvdberge)
 - Added option to use a mod filter in the Grid Filter (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java
index 75fe3bfb9..9160f9d0a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ControllerEnergyForge.java
@@ -8,6 +8,16 @@ public class ControllerEnergyForge extends EnergyStorage {
         super(RS.INSTANCE.config.controllerCapacity, Integer.MAX_VALUE, 0);
     }
 
+    public int extractEnergyInternal(int maxExtract, boolean simulate) {
+        int energyExtracted = Math.min(energy, maxExtract);
+
+        if (!simulate) {
+            energy -= energyExtracted;
+        }
+
+        return energyExtracted;
+    }
+
     public void setMaxEnergyStored(int capacity) {
         this.capacity = capacity;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
index fb0c2d1e8..99da780a7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -290,7 +290,7 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
                 if (!RS.INSTANCE.config.controllerUsesEnergy) {
                     energy.setEnergyStored(energy.getMaxEnergyStored());
                 } else if (energy.getEnergyStored() - getEnergyUsage() >= 0) {
-                    energy.extractEnergy(getEnergyUsage(), false);
+                    energy.extractEnergyInternal(getEnergyUsage(), false);
                 } else {
                     energy.setEnergyStored(0);
                 }