diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java
index d6a69316..25aecf27 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java
@@ -340,8 +340,10 @@ public class PlayerInjectionHandler {
 			if (permanentHook != getPlayerHook(phase)) 
 				setPlayerHook(phase, tempHook);
 			
-			// Save last injector
-			playerInjection.put(player, injector);
+			// Save injector
+			if (injector != null) {
+				playerInjection.put(player, injector);
+			}
 		}
 		
 		return injector;