diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java
index e54a923f..4bc287b0 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java
@@ -591,7 +591,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 
 	@Override
 	public boolean requireInputBuffer(int packetId) {
-		return inputBufferedPackets.contains(PacketType.findLegacy(packetId));
+		return inputBufferedPackets.contains(PacketType.findLegacy(packetId, Sender.CLIENT));
 	}
 	
 	/**
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java
index 18f6446e..703d7e31 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java
@@ -361,7 +361,8 @@ class ProxyPacketInjector implements PacketInjector {
 		
 		// Remove every packet handler
 		for (Integer id : previous.keySet().toArray(new Integer[0])) {
-			removePacketHandler(PacketType.findLegacy(id));
+			removePacketHandler(PacketType.findLegacy(id, Sender.CLIENT));
+			removePacketHandler(PacketType.findLegacy(id, Sender.SERVER));
 		}
 		
 		overwritten.clear();
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java
index 4e34a42c..e62e19c6 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java
@@ -697,8 +697,10 @@ class ProxyPlayerInjectionHandler implements PlayerInjectionHandler {
 				);
 				
 				// These are illegal
-				for (int packetID : result.getPackets())
-					removePacketHandler(PacketType.findLegacy(packetID));
+				for (int packetID : result.getPackets()) {
+					removePacketHandler(PacketType.findLegacy(packetID, Sender.CLIENT));
+					removePacketHandler(PacketType.findLegacy(packetID, Sender.SERVER));
+				}
 			}
 		}
 	}