diff --git a/src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java b/src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java
index e58a57dd4..c60acd806 100644
--- a/src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java
+++ b/src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java
@@ -30,13 +30,6 @@ public class AkarinAsyncExecutor extends Thread {
         MinecraftServer server = MinecraftServer.getServer();
         
         while (server.isRunning()) {
-            server.getWorlds().forEach(world -> world.entityList.forEach(entity -> {
-                if (!entity.dead && entity.spirtingWaterParticle) {
-                    entity.populateSprintingWaterParticles();
-                    entity.spirtingWaterParticle = false;
-                }
-            }));
-            
             try {
                 Thread.sleep(STD_TICK_TIME);
             } catch (InterruptedException interrupted) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9b724e958..4a2760484 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -190,7 +190,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
     protected int numCollisions = 0; // Paper
     // Akarin start
     public boolean enderTeleport;
-    public boolean spirtingWaterParticle;
     // Akarin end
     public void inactiveTick() { }
     // Spigot end
@@ -463,10 +462,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
         }
         */
 
-        // Akarin start - async executor
-        //this.av();
-        this.spirtingWaterParticle = true;
-        // Akarin end
+        //this.av(); // Akarin - this handle by the client
         this.r();
         if (this.world.isClientSide) {
             this.extinguish();
@@ -1285,7 +1281,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
 
     }
 
-    public void populateSprintingWaterParticles() { this.av(); } // Akarin - OBFHELPER
     public void av() {
         if (this.isSprinting() && !this.isInWater()) {
             this.aw();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7532b6644..65d72d5ad 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -793,6 +793,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
 
                 // Spigot start
                 org.spigotmc.WatchdogThread.hasStarted = true; // Paper
+                io.akarin.server.core.AkarinAsyncExecutor.initalise(); // Akarin
                 Arrays.fill( recentTps, 20 );
                 long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
                 lastTick = start - TICK_TIME; // Paper