diff --git a/patches/server/0658-Add-more-advancement-API.patch b/patches/server/0658-Add-more-advancement-API.patch
index 3777b6bc23cb..0def40b23f5b 100644
--- a/patches/server/0658-Add-more-advancement-API.patch
+++ b/patches/server/0658-Add-more-advancement-API.patch
@@ -10,7 +10,7 @@ Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java b/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b9c24b8d83b96d8c66cdf879650027f40eafb274
+index 0000000000000000000000000000000000000000..1705f65d897114dd0813f6d366124cefafcb450e
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java
 @@ -0,0 +1,69 @@
@@ -72,7 +72,7 @@ index 0000000000000000000000000000000000000000..b9c24b8d83b96d8c66cdf879650027f4
 +
 +    @Override
 +    public @NotNull Component displayName() {
-+        return PaperAdventure.asAdventure(Advancement.constructDisplayComponent(null, this.handle));
++        return PaperAdventure.asAdventure(Advancement.decorateName(java.util.Objects.requireNonNull(this.handle, "cannot build display name for null handle, invalid state")));
 +    }
 +
 +    public static @NotNull Frame asPaperFrame(@NotNull FrameType frameType) {