diff --git a/src/main/java/org/dynmap/SimpleWebChatComponent.java b/src/main/java/org/dynmap/SimpleWebChatComponent.java
index 7ab474bc..9a4e7976 100644
--- a/src/main/java/org/dynmap/SimpleWebChatComponent.java
+++ b/src/main/java/org/dynmap/SimpleWebChatComponent.java
@@ -59,14 +59,16 @@ public class SimpleWebChatComponent extends Component {
 
         @Override
         public void onPlayerJoin(PlayerJoinEvent event) {
-            if(plugin.mapManager != null)
+            if((plugin.mapManager != null) && (plugin.playerList != null) && (plugin.playerList.isVisiblePlayer(event.getPlayer()))) {
                 plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
+            }
         }
 
         @Override
         public void onPlayerQuit(PlayerQuitEvent event) {
-            if(plugin.mapManager != null)
+            if((plugin.mapManager != null) && (plugin.playerList != null) && (plugin.playerList.isVisiblePlayer(event.getPlayer()))) {
                 plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
+            }
         }
     }
 
diff --git a/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java b/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java
index 038a9566..a5690173 100644
--- a/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java
+++ b/src/main/java/org/dynmap/herochat/HeroWebChatComponent.java
@@ -60,12 +60,16 @@ public class HeroWebChatComponent extends Component {
     protected class PlayerChatListener extends PlayerListener {
         @Override
         public void onPlayerJoin(PlayerJoinEvent event) {
-            plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
+            if((plugin.mapManager != null) && (plugin.playerList != null) && (plugin.playerList.isVisiblePlayer(event.getPlayer()))) {
+                plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
+            }
         }
 
         @Override
         public void onPlayerQuit(PlayerQuitEvent event) {
-            plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
+            if((plugin.mapManager != null) && (plugin.playerList != null) && (plugin.playerList.isVisiblePlayer(event.getPlayer()))) {
+                plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
+            }
         }
     }
 }