diff --git a/src/main/java/io/github/skippyall/minions/MinionsTickExecutor.java b/src/main/java/io/github/skippyall/minions/MinionsTickExecutor.java
deleted file mode 100644
index 199a9c3..0000000
--- a/src/main/java/io/github/skippyall/minions/MinionsTickExecutor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.github.skippyall.minions;
-
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class MinionsTickExecutor {
-    private static final List<Runnable> executeOnNextTick = Collections.synchronizedList(new ArrayList<>());
-
-    public static void register() {
-        ServerTickEvents.START_SERVER_TICK.register(server -> {
-            synchronized (executeOnNextTick) {
-                for (Runnable run:executeOnNextTick) {
-                    run.run();
-                }
-                executeOnNextTick.clear();
-            }
-        });
-    }
-
-    public static void addExecuteOnNextTick(Runnable run) {
-        executeOnNextTick.add(run);
-
-    }
-}
diff --git a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java
index bf09c0a..37dcd90 100644
--- a/src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java
+++ b/src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java
@@ -69,7 +69,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
             PropertyMap skin = data.skin().orElse(null);
 
             GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skin);
-            doSpawn(data, profile, server, level, pos, rot);
+            server.send(server.createTask(() -> doSpawn(data, profile, server, level, pos, rot)));
         }
     }