diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
index 60548561..8423c856 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
@@ -155,10 +155,10 @@ public static class Item
         Boolean listed;
 
         // ADD_PLAYER & UPDATE_GAMEMODE
-        Integer gamemode;
+        int gamemode;
 
         // ADD_PLAYER & UPDATE_LATENCY
-        Integer ping;
+        int ping;
 
         // ADD_PLAYER & UPDATE_DISPLAY_NAME
         String displayName;
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 a0baa388..74666a9b 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
@@ -90,11 +90,11 @@ private static void rewrite(PlayerListItem.Item item)
                     item.setProperties( new Property[ 0 ] );
                 }
             }
-            if ( item.getGamemode() != null )
+            if ( item.getGamemode() != player.getGamemode() )
             {
                 player.setGamemode( item.getGamemode() );
             }
-            if ( item.getPing() != null )
+            if ( item.getPing() != player.getPing() )
             {
                 player.setPing( item.getPing() );
             }