diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java
index 9d57fa95f..cd5f11693 100644
--- a/src/main/java/appeng/container/AEBaseContainer.java
+++ b/src/main/java/appeng/container/AEBaseContainer.java
@@ -961,13 +961,13 @@ public abstract class AEBaseContainer extends Container {
 
     @Override
     public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, @NotNull EntityPlayer player) {
-        final var slot = this.getSlot(slotId);
-        if (slot instanceof SlotDisabled) {
-            return ItemStack.EMPTY;
-        }
+        if (slotId >= 0) {
+            final var slot = this.getSlot(slotId);
+            if (slot instanceof SlotDisabled) {
+                return ItemStack.EMPTY;
+            }
 
-        if (slotId >= 0 && clickTypeIn == ClickType.PICKUP) {
-            if (slot instanceof AppEngSlot appEngSlot) {
+            if (slot instanceof AppEngSlot appEngSlot && clickTypeIn == ClickType.PICKUP) {
                 var slotStack = slot.getStack();
                 var draggedStack = this.invPlayer.getItemStack();