diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
index 441e2122f8..8464531a4e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
@@ -54,7 +54,7 @@ public final class CraftCriteria implements Criteria {
     }
 
     static CraftCriteria getFromNMS(Objective objective) {
-        return CraftCriteria.DEFAULTS.get(objective.getCriteria().getName());
+        return java.util.Objects.requireNonNullElseGet(CraftCriteria.DEFAULTS.get(objective.getCriteria().getName()), () -> new CraftCriteria(objective.getCriteria())); // Paper
     }
 
     public static CraftCriteria getFromBukkit(String name) {