diff --git a/proxy/src/main/java/net/md_5/bungee/tab/TabList.java b/proxy/src/main/java/net/md_5/bungee/tab/TabList.java
index 00f57b2a..7d79ef7b 100644
--- a/proxy/src/main/java/net/md_5/bungee/tab/TabList.java
+++ b/proxy/src/main/java/net/md_5/bungee/tab/TabList.java
@@ -57,7 +57,10 @@ public abstract class TabList
                 {
                     player.setGamemode( item.getGamemode() );
                 }
-                player.setPing( player.getPing() );
+                if ( playerListItem.getAction() == PlayerListItem.Action.ADD_PLAYER || playerListItem.getAction() == PlayerListItem.Action.UPDATE_LATENCY )
+                {
+                    player.setPing( item.getPing() );
+                }
             }
         }
         return playerListItem;