diff --git a/versionsupport_common/src/main/java/com/andrei1058/bedwars/listeners/ItemDropPickListener.java b/versionsupport_common/src/main/java/com/andrei1058/bedwars/listeners/ItemDropPickListener.java
index 4520976a0..441c7a001 100644
--- a/versionsupport_common/src/main/java/com/andrei1058/bedwars/listeners/ItemDropPickListener.java
+++ b/versionsupport_common/src/main/java/com/andrei1058/bedwars/listeners/ItemDropPickListener.java
@@ -87,17 +87,6 @@ public void onArrowPick(PlayerPickupArrowEvent e){
         }
     }
 
-    // common
-    public static class GeneratorCollect implements Listener {
-        @EventHandler
-        //Prevent AFK players from picking items
-        public void onCollect(PlayerGeneratorCollectEvent e){
-            if (api.getAFKUtil().isPlayerAFK(e.getPlayer())){
-                e.setCancelled(true);
-            }
-        }
-    }
-
     /**
      * @return true if event should be cancelled
      */
@@ -144,7 +133,7 @@ private static boolean managePickup(Item item, LivingEntity player) {
                         } else {
                             item.getItemStack().setItemMeta(itemMeta);
                         }
-                    }
+                    }else return true; //Cancel event if player is afk
                 }
             }
         }
diff --git a/versionsupport_common/src/main/java/com/andrei1058/bedwars/listeners/PlayerDropPick_1_11Minus.java b/versionsupport_common/src/main/java/com/andrei1058/bedwars/listeners/PlayerDropPick_1_11Minus.java
index 99afa1b17..eb32d70a3 100644
--- a/versionsupport_common/src/main/java/com/andrei1058/bedwars/listeners/PlayerDropPick_1_11Minus.java
+++ b/versionsupport_common/src/main/java/com/andrei1058/bedwars/listeners/PlayerDropPick_1_11Minus.java
@@ -101,6 +101,9 @@ public void onPickup(PlayerPickupItemEvent e) {
                             e.getItem().getItemStack().setItemMeta(itemMeta);
                         }
                     }
+                    else {  //Cancel Event if play is afk
+                        e.setCancelled(true);
+                    }
                 }
             }
         }
diff --git a/versionsupport_common/src/main/java/com/andrei1058/bedwars/support/version/common/VersionCommon.java b/versionsupport_common/src/main/java/com/andrei1058/bedwars/support/version/common/VersionCommon.java
index 54adbad7e..09a6d6f95 100644
--- a/versionsupport_common/src/main/java/com/andrei1058/bedwars/support/version/common/VersionCommon.java
+++ b/versionsupport_common/src/main/java/com/andrei1058/bedwars/support/version/common/VersionCommon.java
@@ -65,7 +65,7 @@ public VersionCommon(VersionSupport versionSupport) {
             //}
 
             // common
-            registerListeners(versionSupport.getPlugin(), new ItemDropPickListener.GeneratorCollect(), new ShopItemRestoreListener.DefaultRestoreInvClose());
+            registerListeners(versionSupport.getPlugin(), new ShopItemRestoreListener.DefaultRestoreInvClose());
     }
 
     private void registerListeners(Plugin plugin, Listener... listener) {