diff --git a/nms-patches/net/minecraft/world/entity/monster/EntitySkeleton.patch b/nms-patches/net/minecraft/world/entity/monster/EntitySkeleton.patch
index ddc3ae31a..6cb71e564 100644
--- a/nms-patches/net/minecraft/world/entity/monster/EntitySkeleton.patch
+++ b/nms-patches/net/minecraft/world/entity/monster/EntitySkeleton.patch
@@ -1,11 +1,22 @@
 --- a/net/minecraft/world/entity/monster/EntitySkeleton.java
 +++ b/net/minecraft/world/entity/monster/EntitySkeleton.java
-@@ -99,7 +99,7 @@
+@@ -94,12 +94,17 @@
+     }
+ 
+     protected void doFreezeConversion() {
+-        this.convertTo(EntityTypes.STRAY, ConversionParams.single(this, true, true), (entityskeletonstray) -> {
++        net.minecraft.world.entity.monster.EntitySkeletonStray converted = this.convertTo(EntityTypes.STRAY, ConversionParams.single(this, true, true), (entityskeletonstray) -> { // CraftBukkit
+             if (!this.isSilent()) {
                  this.level().levelEvent((EntityHuman) null, 1048, this.blockPosition(), 0);
              }
  
 -        });
-+        }, org.bukkit.event.entity.EntityTransformEvent.TransformReason.FROZEN, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.FROZEN); // CraftBukkit - add spawn and transform reasons
++        // CraftBukkit start
++        }, org.bukkit.event.entity.EntityTransformEvent.TransformReason.FROZEN, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.FROZEN);
++        if (converted == null) {
++            ((org.bukkit.entity.Skeleton) getBukkitEntity()).setConversionTime(-1); // CraftBukkit - SPIGOT-7997: End conversion to stop event spam
++        }
++        // CraftBukkit end
      }
  
      @Override