diff --git a/CHANGELOG.md b/CHANGELOG.md
index 047ce25cc..4079bcd2b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 1.5.10
 - Converted Solderer recipes to JSON (raoulvdberge)
+- Implemented controller update throttling, should fix lag issues with controllers that constantly turn off and on (raoulvdberge)
 
 ### 1.5.9
 - Fixed crash relating to MCMP (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
index 0059e710d..1931f67fc 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -108,6 +108,9 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
         return nodes;
     });
 
+    private static final int THROTTLE_INACTIVE_TO_ACTIVE = 20;
+    private static final int THROTTLE_ACTIVE_TO_INACTIVE = 4;
+
     public static final String NBT_ENERGY = "Energy";
     public static final String NBT_ENERGY_CAPACITY = "EnergyCapacity";
 
@@ -135,6 +138,7 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
     private int lastEnergyDisplay;
 
     private boolean couldRun;
+    private int ticksSinceUpdateChanged;
 
     private boolean craftingMonitorUpdateRequested;
 
@@ -216,15 +220,26 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
                 energy.setEnergyStored(energy.getMaxEnergyStored());
             }
 
-            if (couldRun != canRun()) {
-                couldRun = canRun();
+            boolean canRun = canRun();
 
-                nodeGraph.rebuild();
-                securityManager.rebuild();
+            if (couldRun != canRun) {
+                ++ticksSinceUpdateChanged;
+
+                if (canRun ? (ticksSinceUpdateChanged > THROTTLE_INACTIVE_TO_ACTIVE) : (ticksSinceUpdateChanged > THROTTLE_ACTIVE_TO_INACTIVE)) {
+                    ticksSinceUpdateChanged = 0;
+                    couldRun = canRun;
+
+                    nodeGraph.rebuild();
+                    securityManager.rebuild();
+                }
+            } else {
+                ticksSinceUpdateChanged = 0;
             }
 
-            if (getEnergyScaledForDisplay() != lastEnergyDisplay) {
-                lastEnergyDisplay = getEnergyScaledForDisplay();
+            int energyDisplay = getEnergyScaledForDisplay();
+
+            if (lastEnergyDisplay != energyDisplay) {
+                lastEnergyDisplay = energyDisplay;
 
                 RSUtils.updateBlock(world, pos);
             }