diff --git a/spigot/src/main/java/me/wolfyscript/customcrafting/gui/elite_crafting/CraftingWindow.java b/spigot/src/main/java/me/wolfyscript/customcrafting/gui/elite_crafting/CraftingWindow.java
index eeb292019..836dc70c5 100644
--- a/spigot/src/main/java/me/wolfyscript/customcrafting/gui/elite_crafting/CraftingWindow.java
+++ b/spigot/src/main/java/me/wolfyscript/customcrafting/gui/elite_crafting/CraftingWindow.java
@@ -37,10 +37,12 @@
 import me.wolfyscript.utilities.api.inventory.gui.button.CallbackButtonRender;
 import me.wolfyscript.utilities.api.inventory.gui.button.buttons.DummyButton;
 import me.wolfyscript.utilities.api.nms.inventory.GUIInventory;
+import me.wolfyscript.utilities.util.inventory.ItemUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
@@ -108,6 +110,10 @@ public void onInit() {
                             return true;
                         }
                         CacheEliteCraftingTable cacheEliteCraftingTable = cache.getEliteWorkbench();
+                        if (event instanceof InventoryClickEvent clickEvent && clickEvent.getClick().equals(ClickType.DOUBLE_CLICK)) {
+                            clickEvent.setCancelled(true);
+                            return true;
+                        }
                         if (cacheEliteCraftingTable.getContents() != null) {
                             return InteractionUtils.applyItemFromInteractionEvent(slot, event, CRAFTING_SLOTS_MAP.get(cacheEliteCraftingTable.getCurrentGridSize()), itemStack -> cacheEliteCraftingTable.getContents()[recipeSlot] = itemStack);
                         }
diff --git a/spigot/src/main/java/me/wolfyscript/customcrafting/listeners/PlayerListener.java b/spigot/src/main/java/me/wolfyscript/customcrafting/listeners/PlayerListener.java
index e0a9d0a49..4ff8117f6 100644
--- a/spigot/src/main/java/me/wolfyscript/customcrafting/listeners/PlayerListener.java
+++ b/spigot/src/main/java/me/wolfyscript/customcrafting/listeners/PlayerListener.java
@@ -24,14 +24,19 @@
 
 import me.wolfyscript.customcrafting.CustomCrafting;
 import me.wolfyscript.customcrafting.configs.customitem.RecipeBookSettings;
+import me.wolfyscript.customcrafting.data.CCCache;
 import me.wolfyscript.customcrafting.utils.ItemLoader;
 import me.wolfyscript.customcrafting.utils.PlayerUtil;
 import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem;
+import me.wolfyscript.utilities.util.inventory.ItemUtils;
+import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
 
 public class PlayerListener implements Listener {
@@ -57,6 +62,16 @@ public void onJoin(PlayerJoinEvent event) {
             customCrafting.getUpdateChecker().run(player);
         }
     }
+    
+    @EventHandler
+    public void onQuit(PlayerQuitEvent event) {
+        returnEliteWorkbenchItems(event.getPlayer());
+    }
+
+    @EventHandler
+    public void onKick(PlayerKickEvent event) {
+        returnEliteWorkbenchItems(event.getPlayer());
+    }
 
     @EventHandler
     public void onClick(PlayerInteractEvent event) {
@@ -71,4 +86,21 @@ public void onClick(PlayerInteractEvent event) {
             }
         }
     }
+    private void returnEliteWorkbenchItems(org.bukkit.entity.Player player) {
+        var guiHandler = customCrafting.getApi().getInventoryAPI(CCCache.class).getGuiHandler(player);
+        var cacheEliteCraftingTable = guiHandler.getCustomCache().getEliteWorkbench();
+        if (cacheEliteCraftingTable.getContents() == null) return;
+
+        for (ItemStack itemStack : cacheEliteCraftingTable.getContents()) {
+            if (!ItemUtils.isAirOrNull(itemStack)) {
+                var remaining = player.getInventory().addItem(itemStack).values();
+                remaining.forEach(stack -> player.getWorld().dropItem(player.getLocation(), stack));
+            }
+        }
+        cacheEliteCraftingTable.setCustomItem(null);
+        cacheEliteCraftingTable.setSettings(null);
+        cacheEliteCraftingTable.setResult(new ItemStack(Material.AIR));
+        cacheEliteCraftingTable.setContents(null);
+        cacheEliteCraftingTable.setCurrentGridSize((byte) 0);
+    }
 }