diff --git a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/TaskManager.class b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/TaskManager.class
index ab707f69..f357f524 100644
Binary files a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/TaskManager.class and b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/TaskManager.class differ
diff --git a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/Wardrobe.class b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/Wardrobe.class
index 66034a57..94cc134e 100644
Binary files a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/Wardrobe.class and b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/Wardrobe.class differ
diff --git a/common/src/main/java/io/github/fisher2911/hmccosmetics/task/TaskManager.java b/common/src/main/java/io/github/fisher2911/hmccosmetics/task/TaskManager.java
index 60c70837..b620cca1 100644
--- a/common/src/main/java/io/github/fisher2911/hmccosmetics/task/TaskManager.java
+++ b/common/src/main/java/io/github/fisher2911/hmccosmetics/task/TaskManager.java
@@ -6,12 +6,13 @@ import org.bukkit.scheduler.BukkitTask;
 
 import java.util.LinkedList;
 import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class TaskManager {
 
     private final HMCCosmetics plugin;
     private BukkitTask timer;
-    private final Queue<Task> tasks = new LinkedList<>();
+    private final Queue<Task> tasks = new ConcurrentLinkedQueue<>();
 
     public TaskManager(final HMCCosmetics plugin) {
         this.plugin = plugin;
diff --git a/common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java b/common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java
index 11ecb992..f0e35e07 100644
--- a/common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java
+++ b/common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java
@@ -15,7 +15,6 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.text.html.Option;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -135,7 +134,8 @@ public class Wardrobe extends User {
                 () -> {
                     PacketManager.sendPacket(
                             viewer,
-                            PacketManager.getEntityDestroyPacket(this.getEntityId())
+                            PacketManager.getEntityDestroyPacket(this.getEntityId()),
+                            PacketManager.getRemovePlayerPacket(viewer, this.id, this.getEntityId())
                             // for spectator packets
 //                PacketManager.getEntityDestroyPacket(this.viewerId)
                     );