diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index 92d6ac0b7..737bf5088 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -43,6 +43,11 @@ enable-tps-catchup
 * **default**: false
 * **description**: Enable/disable Spigot's TPS catchup (makes everything tick faster than 20 tps after lag spikes, which can cause more lag - also skews /tps reports by ruining the average with above 20 tps entries)
 
+large-ender-chests
+~~~~~~~~~~~~~~
+* **default**: true
+* **description:** Use large size ender chests (6 rows, aka 54 slots)
+
 packed-barrels
 ~~~~~~~~~~~~~~
 * **default**: true
diff --git a/patches/server/0035-Add-large-sized-ender-chests.patch b/patches/server/0035-Add-large-sized-ender-chests.patch
new file mode 100644
index 000000000..efe6e2122
--- /dev/null
+++ b/patches/server/0035-Add-large-sized-ender-chests.patch
@@ -0,0 +1,55 @@
+From 08f3258212f82ee1bebb73bb73c9eb2bc1c25206 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sun, 23 Jun 2019 17:01:26 -0500
+Subject: [PATCH] Add large sized ender chests
+
+---
+ src/main/java/net/minecraft/server/BlockEnderChest.java     | 1 +
+ src/main/java/net/minecraft/server/InventoryEnderChest.java | 2 +-
+ src/main/java/net/pl3x/purpur/PurpurConfig.java             | 5 +++++
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
+index 4b72902385..fc52276836 100644
+--- a/src/main/java/net/minecraft/server/BlockEnderChest.java
++++ b/src/main/java/net/minecraft/server/BlockEnderChest.java
+@@ -46,6 +46,7 @@ public class BlockEnderChest extends BlockTileEntity implements IBlockWaterlogge
+ 
+                 inventoryenderchest.a(tileentityenderchest);
+                 entityhuman.openContainer(new TileInventory((i, playerinventory, entityhuman1) -> {
++                    if (net.pl3x.purpur.PurpurConfig.largeEnderChests) return ContainerChest.b(i, playerinventory, inventoryenderchest); // Purpur
+                     return ContainerChest.a(i, playerinventory, inventoryenderchest);
+                 }, BlockEnderChest.d));
+                 entityhuman.a(StatisticList.OPEN_ENDERCHEST);
+diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
+index fd31b9a6dc..49b369236d 100644
+--- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
++++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
+@@ -20,7 +20,7 @@ public class InventoryEnderChest extends InventorySubcontainer {
+     }
+ 
+     public InventoryEnderChest(EntityHuman owner) {
+-        super(27);
++        super(net.pl3x.purpur.PurpurConfig.largeEnderChests ? 54 : 27); // Purpur
+         this.owner = owner;
+         // CraftBukkit end
+     }
+diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
+index afe16a7f55..9c7b8f3827 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
++++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
+@@ -152,6 +152,11 @@ public class PurpurConfig {
+         snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
+     }
+ 
++    public static boolean largeEnderChests = true;
++    private static void largeEnderChests() {
++        largeEnderChests = getBoolean("settings.large-ender-chests", largeEnderChests);
++    }
++
+     public static boolean packedBarrels = true;
+     private static void packedBarrels() {
+         packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
+-- 
+2.20.1
+