diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs
index 38d89d50..2036b75b 100644
--- a/MinecraftClient/Protocol/Handlers/Protocol18.cs
+++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs
@@ -305,10 +305,13 @@ namespace MinecraftClient.Protocol.Handlers
                 else switch (packetPalette.GetIncommingTypeById(packetID))
                     {
                         case PacketTypesIn.KeepAlive:
-                            //log.Info("KeepAlive");
                             SendPacket(PacketTypesOut.KeepAlive, packetData);
                             handler.OnServerKeepAlive();
                             break;
+                        case PacketTypesIn.Ping:
+                            int ID = dataTypes.ReadNextInt(packetData);
+                            SendPacket(PacketTypesOut.Pong, dataTypes.GetInt(ID));
+                            break;
                         case PacketTypesIn.JoinGame:
                             handler.OnGameJoined();
                             int playerEntityID = dataTypes.ReadNextInt(packetData);