diff --git a/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java b/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
index c526594..658262f 100644
--- a/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
+++ b/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
@@ -310,7 +310,13 @@ public class TinyProtocol {
 		}
 
 		// See ChannelInjector in ProtocolLib, line 590
-		channel.eventLoop().execute(() -> channel.pipeline().remove(handlerName));
+		channel.eventLoop().execute(() -> {
+			try {
+				channel.pipeline().remove(handlerName);
+			} catch (NoSuchElementException e) {
+				// ignore
+			}
+		});
 	}
 
 	public boolean hasInjected(Player player) {