diff --git a/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt b/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt
index 8e50b395..731aad4c 100644
--- a/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt
+++ b/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt
@@ -155,12 +155,11 @@ class VanishManager(
             }
         }
 
-        // TODO: mob.target is nullable
         player.world.entities.stream()
             .filter { entity -> entity is Creature }
             .map { entity -> entity as Creature }
             .filter { mob -> mob.target != null }
-            .filter { mob -> player.uniqueId == mob.target!!.uniqueId }
+            .filter { mob -> player.uniqueId == mob.target?.uniqueId }
             .forEach { mob -> mob.target = null }
 
         addPotionEffects(player)