diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java b/paper-server/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java
index aeb04a65a1..ec3b9cb901 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java
@@ -44,7 +44,7 @@ public class CraftAdvancementProgress implements AdvancementProgress {
     @Override
     public Date getDateAwarded(String criteria) {
         CriterionProgress criterion = this.handle.getCriterion(criteria);
-        return (criterion == null) ? null : Date.from(criterion.getObtained());
+        return (criterion == null) ? null : criterion.getObtained() == null ? null : Date.from(criterion.getObtained()); // Paper - fix NPE if criterion isn't obtained
     }
 
     @Override