diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java
index ace80c417..d9eabb0b9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java
@@ -81,7 +81,7 @@ public class ContainerCoffeeMachine extends AbstractContainerMenu {
             //Other Slots in Inventory excluded
             else if (slot >= inventoryStart) {
                 //Shift from Inventory
-                if (newStack.getItem() == ActuallyItems.COFFEE_CUP.get()) {
+                if (newStack.getItem() == ActuallyItems.EMPTY_CUP.get()) {
                     if (!this.moveItemStackTo(newStack, TileEntityCoffeeMachine.SLOT_INPUT, TileEntityCoffeeMachine.SLOT_INPUT + 1, false)) {
                         return ItemStack.EMPTY;
                     }
diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json
index 58eda9a19..13c628675 100644
--- a/src/main/resources/assets/actuallyadditions/lang/en_us.json
+++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json
@@ -168,7 +168,7 @@
   "block.actuallyadditions.dropper": "Automatic Precision Dropper",
   "block.actuallyadditions.ender_casing": "Ender Casing",
   "block.actuallyadditions.flax": "Flax Plant",
-  "block.actuallyadditions.coffee_machine": "Coffee Maker (wip)",
+  "block.actuallyadditions.coffee_machine": "Coffee Maker",
   "block.actuallyadditions.xp_solidifier": "Experience Solidifier (wip)",
   "block.actuallyadditions.leaf_generator": "Leaf-Eating Generator (wip)",
   "block.actuallyadditions.long_range_breaker": "Long-Range Breaker (wip)",
@@ -301,7 +301,7 @@
   "item.actuallyadditions.netherite_aiot": "Netherite AIOT (wip)",
   "item.actuallyadditions.phantom_connector": "Phantom Connector (wip)",
   "item.actuallyadditions.empty_cup": "Empty Cup",
-  "item.actuallyadditions.coffee_cup": "Cup with Coffee (wip)",
+  "item.actuallyadditions.coffee_cup": "Cup with Coffee",
   "item.actuallyadditions.coffee_seeds": "Coffee Seeds",
   "item.actuallyadditions.coffee_beans": "Coffee Beans (wip)",
   "item.actuallyadditions.canola_seeds": "Canola Seeds",