diff --git a/Changelog.txt b/Changelog.txt
index 6379e41053..adcf2f8a3c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -4,6 +4,7 @@ Version 2.2.049
     (Codebase) Fixed unit tests for Java 25 (thanks Warriorrrr)
     Fixed copper items not giving XP for Repair (thanks Remski01)
     Fixed edge case where mcMMO could drop items with stack size set outside normal bounds
+    Fixed a bug where tamed wolves could cause errors on Folia (thanks Warriorrrr)
 
     NOTES:
     As a semi-permanent work around, mcMMO keeps track of when players swing their weapon, if they have swung it recently enough combat skills will work even if you have a spear in your off-hand.
diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
index b19135fd98..8b184395d3 100644
--- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
@@ -304,7 +304,7 @@ public void processEnvironmentallyAware(@NotNull Wolf wolf, double damage) {
 
         Player owner = getPlayer();
 
-        wolf.teleport(owner);
+        mcMMO.p.getFoliaLib().getScheduler().teleportAsync(wolf, owner.getLocation());
         NotificationManager.sendPlayerInformation(owner, NotificationType.SUBSKILL_MESSAGE,
                 "Taming.Listener.Wolf");
     }