diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index e1db3eae..2cbe0520 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -268,7 +268,7 @@ public enum Protocol
         private ProtocolData getProtocolData(int version)
         {
             ProtocolData protocol = protocols.get( version );
-            if ( protocol == null && ( protocolPhase == Protocol.HANDSHAKE || protocolPhase == Protocol.STATUS ) )
+            if ( protocol == null && ( protocolPhase != Protocol.GAME ) )
             {
                 protocol = Iterables.getFirst( protocols.valueCollection(), null );
             }