diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java
index ee4a3350..1f19286a 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java
@@ -26,10 +26,12 @@ public class LegacyDecoder extends ByteToMessageDecoder
         if ( b1 == 0xFE && b2 == 0x01 && b3 == 0xFA )
         {
             out.add( new PacketWrapper( new LegacyPing(), Unpooled.EMPTY_BUFFER ) );
+            return;
         }
         if ( b1 == 0x02 && b2 >= 60 && b2 <= 78 )
         {
             out.add( new PacketWrapper( new LegacyHandshake(), Unpooled.EMPTY_BUFFER ) );
+            return;
         }
         ctx.pipeline().remove( this );
     }