diff --git a/addons/sourcemod/plugins/optional/l4d2_pickup.smx b/addons/sourcemod/plugins/optional/l4d2_pickup.smx
index 3d58d4a95..68759d189 100644
Binary files a/addons/sourcemod/plugins/optional/l4d2_pickup.smx and b/addons/sourcemod/plugins/optional/l4d2_pickup.smx differ
diff --git a/addons/sourcemod/scripting/l4d2_pickup.sp b/addons/sourcemod/scripting/l4d2_pickup.sp
index 2e8c932aa..3b6f8b105 100644
--- a/addons/sourcemod/scripting/l4d2_pickup.sp
+++ b/addons/sourcemod/scripting/l4d2_pickup.sp
@@ -254,7 +254,7 @@ public void OnClientPutInServer(int client)
 	HookValidClient(client, true);
 	
 	if (!QuerySwitchCookie(client, g_iSwitchOnPickup[client]))
-		g_iSwitchOnPickup[client] = g_iSwitchFlags & (FLAGS_SWITCH_MELEE|FLAGS_SWITCH_GUNS);
+		g_iSwitchOnPickup[client] = g_iSwitchFlags & FLAGS_SWITCH_GUNS;
 }
 
 public void OnClientDisconnect(int client)
diff --git a/cfg/cfgogl/allcharger/shared_settings.cfg b/cfg/cfgogl/allcharger/shared_settings.cfg
index 9af3b3205..e4b33e08d 100644
--- a/cfg/cfgogl/allcharger/shared_settings.cfg
+++ b/cfg/cfgogl/allcharger/shared_settings.cfg
@@ -172,7 +172,7 @@ confogl_addcvar vs_tank_pound_damage 100
 confogl_addcvar vs_tank_rock_damage 36
 
 // [l4d2_pickup.smx]
-confogl_addcvar pickup_switch_flags 3
+confogl_addcvar pickup_switch_flags 7
 confogl_addcvar pickup_incap_flags 6
 
 // [l4d2_car_alarm_hittable_fix.smx]
diff --git a/cfg/cfgogl/alone/shared_settings.cfg b/cfg/cfgogl/alone/shared_settings.cfg
index 9395e98e3..23ec9a9c5 100644
--- a/cfg/cfgogl/alone/shared_settings.cfg
+++ b/cfg/cfgogl/alone/shared_settings.cfg
@@ -231,7 +231,7 @@ confogl_addcvar vs_tank_pound_damage 100
 confogl_addcvar vs_tank_rock_damage 36
 
 // [l4d2_pickup.smx]
-confogl_addcvar pickup_switch_flags 3
+confogl_addcvar pickup_switch_flags 7
 confogl_addcvar pickup_incap_flags 6
 
 // [l4d2_car_alarm_hittable_fix.smx]
diff --git a/cfg/cfgogl/annehappy/shared_settings.cfg b/cfg/cfgogl/annehappy/shared_settings.cfg
index f332f6778..816cd268c 100644
--- a/cfg/cfgogl/annehappy/shared_settings.cfg
+++ b/cfg/cfgogl/annehappy/shared_settings.cfg
@@ -252,7 +252,7 @@ confogl_addcvar vs_tank_pound_damage 100
 confogl_addcvar vs_tank_rock_damage 36
 
 // [l4d2_pickup.smx]
-confogl_addcvar pickup_switch_flags 3
+confogl_addcvar pickup_switch_flags 7
 confogl_addcvar pickup_incap_flags 6
 
 // [l4d2_car_alarm_hittable_fix.smx]
diff --git a/cfg/cfgogl/annehappy_hardcore/shared_settings.cfg b/cfg/cfgogl/annehappy_hardcore/shared_settings.cfg
index d151e7295..22da2260d 100644
--- a/cfg/cfgogl/annehappy_hardcore/shared_settings.cfg
+++ b/cfg/cfgogl/annehappy_hardcore/shared_settings.cfg
@@ -252,7 +252,7 @@ confogl_addcvar vs_tank_pound_damage 100
 confogl_addcvar vs_tank_rock_damage 36
 
 // [l4d2_pickup.smx]
-confogl_addcvar pickup_switch_flags 3
+confogl_addcvar pickup_switch_flags 7
 confogl_addcvar pickup_incap_flags 6
 
 // [l4d2_car_alarm_hittable_fix.smx]
diff --git a/cfg/cfgogl/hunters/shared_settings.cfg b/cfg/cfgogl/hunters/shared_settings.cfg
index f0b254d0d..2c2ea1aa5 100644
--- a/cfg/cfgogl/hunters/shared_settings.cfg
+++ b/cfg/cfgogl/hunters/shared_settings.cfg
@@ -156,7 +156,7 @@ confogl_addcvar vs_tank_pound_damage 100
 confogl_addcvar vs_tank_rock_damage 36
 
 // [l4d2_pickup.smx]
-confogl_addcvar pickup_switch_flags 3
+confogl_addcvar pickup_switch_flags 7
 confogl_addcvar pickup_incap_flags 6
 
 // [l4d2_car_alarm_hittable_fix.smx]
diff --git a/cfg/cfgogl/witchparty/shared_settings.cfg b/cfg/cfgogl/witchparty/shared_settings.cfg
index 398404c9d..d4be6acf3 100644
--- a/cfg/cfgogl/witchparty/shared_settings.cfg
+++ b/cfg/cfgogl/witchparty/shared_settings.cfg
@@ -171,7 +171,7 @@ confogl_addcvar vs_tank_pound_damage 100
 confogl_addcvar vs_tank_rock_damage 36
 
 // [l4d2_pickup.smx]
-confogl_addcvar pickup_switch_flags 3
+confogl_addcvar pickup_switch_flags 7
 confogl_addcvar pickup_incap_flags 6
 
 // [l4d2_car_alarm_hittable_fix.smx]