diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java
index d85fa1b6..ff8b1d4b 100644
--- a/common/buildcraft/energy/TileEngine.java
+++ b/common/buildcraft/energy/TileEngine.java
@@ -120,7 +120,8 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven
 				if (isPoweredTile(tile)) {
 					IPowerProvider receptor = ((IPowerReceptor) tile).getPowerProvider();
 
-					float extracted = engine.extractEnergy(receptor.getMinEnergyReceived(), receptor.getMaxEnergyReceived(), true);
+					float extracted = engine.extractEnergy(receptor.getMinEnergyReceived(),
+							Math.min(receptor.getMaxEnergyReceived(), receptor.getMaxEnergyStored() - (int) receptor.getEnergyStored()), true);
 
 					if (extracted > 0) {
 						receptor.receiveEnergy(extracted, engine.orientation.getOpposite());