diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
index 9c9d9b44a..24e245cbc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
@@ -55,7 +55,7 @@ public class ItemBattery extends ItemEnergy{
             EntityPlayer player = (EntityPlayer)entity;
             for(int i = 0; i < player.inventory.getSizeInventory(); i++){
                 ItemStack slot = player.inventory.getStackInSlot(i);
-                if(StackUtil.isValid(slot)){
+                if(StackUtil.isValid(slot) && slot.getCount() == 1){
                     int extractable = this.extractEnergy(stack, Integer.MAX_VALUE, true);
                     int received = 0;
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java
index 8b17499f1..c38f9f344 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java
@@ -78,7 +78,7 @@ public class TileEntityPlayerInterface extends TileEntityBase implements IEnergy
                 for(int i = 0; i < player.inventory.getSizeInventory(); i++){
                     if(this.storage.getEnergyStored() > 0){
                         ItemStack slot = player.inventory.getStackInSlot(i);
-                        if(StackUtil.isValid(slot)){
+                        if(StackUtil.isValid(slot) && slot.getCount() == 1){
 
                             int received = 0;
                             if(slot.hasCapability(CapabilityEnergy.ENERGY, null)){