diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index b9189c4f35..4f43f87cd4 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -15,6 +15,7 @@ import net.minecraft.server.ContainerGrindstone;
 import net.minecraft.server.ContainerHopper;
 import net.minecraft.server.ContainerLectern;
 import net.minecraft.server.ContainerLoom;
+import net.minecraft.server.ContainerMerchant;
 import net.minecraft.server.ContainerProperties;
 import net.minecraft.server.ContainerShulkerBox;
 import net.minecraft.server.ContainerSmoker;
@@ -247,6 +248,9 @@ public class CraftContainer extends Container {
             case STONECUTTER:
                 delegate = new ContainerStonecutter(windowId, bottom);
                 break;
+            case MERCHANT:
+                delegate = new ContainerMerchant(windowId, bottom);
+                break;
         }
 
         if (delegate != null) {