diff --git a/src/main/java/me/arasple/mc/trhologram/hologram/Hologram.kt b/src/main/java/me/arasple/mc/trhologram/hologram/Hologram.kt
index 40a2519..b9c92a1 100644
--- a/src/main/java/me/arasple/mc/trhologram/hologram/Hologram.kt
+++ b/src/main/java/me/arasple/mc/trhologram/hologram/Hologram.kt
@@ -63,12 +63,13 @@ class Hologram(var loadedFrom: String?, val id: String, private var loc: Locatio
                         hologram.display(player)
                     } else if (!hologram.isVisible(player) && hologram.viewers.contains(player)) {
                         hologram.destroy(player)
+                        hologram.viewers.remove(player)
                     }
                 }
             }
         }
 
-        fun destroy(player: Player) {
+        fun destroyFor(player: Player) {
             HOLOGRAMS.values.forEach { list ->
                 list.forEach { hologram ->
                     hologram.removeViewer(player)
diff --git a/src/main/java/me/arasple/mc/trhologram/listeners/ListenerPlayerChangeWorld.kt b/src/main/java/me/arasple/mc/trhologram/listeners/ListenerPlayerChangeWorld.kt
index 1be1f4c..321ab8e 100644
--- a/src/main/java/me/arasple/mc/trhologram/listeners/ListenerPlayerChangeWorld.kt
+++ b/src/main/java/me/arasple/mc/trhologram/listeners/ListenerPlayerChangeWorld.kt
@@ -3,6 +3,7 @@ package me.arasple.mc.trhologram.listeners
 import io.izzel.taboolib.module.inject.TListener
 import me.arasple.mc.trhologram.hologram.Hologram
 import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerChangedWorldEvent
 
@@ -13,7 +14,7 @@ import org.bukkit.event.player.PlayerChangedWorldEvent
 @TListener
 class ListenerPlayerChangeWorld : Listener {
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     fun onChange(e: PlayerChangedWorldEvent) {
         Hologram.display(e.player)
     }
diff --git a/src/main/java/me/arasple/mc/trhologram/listeners/ListenerPlayerQuit.kt b/src/main/java/me/arasple/mc/trhologram/listeners/ListenerPlayerQuit.kt
index cc83e66..42f8996 100644
--- a/src/main/java/me/arasple/mc/trhologram/listeners/ListenerPlayerQuit.kt
+++ b/src/main/java/me/arasple/mc/trhologram/listeners/ListenerPlayerQuit.kt
@@ -15,7 +15,7 @@ class ListenerPlayerQuit : Listener {
 
     @EventHandler
     fun onQuit(e: PlayerQuitEvent) {
-        Hologram.destroy(e.player)
+        Hologram.destroyFor(e.player)
     }
 
 }