diff --git a/peachjam/models/judgment.py b/peachjam/models/judgment.py
index 9852a21e6..8954138b4 100644
--- a/peachjam/models/judgment.py
+++ b/peachjam/models/judgment.py
@@ -349,7 +349,19 @@ def __str__(self):
     def get_case_number_string(self):
         if self.string_override:
             return self.string_override
-        return f"{self.matter_type or ''} {self.number} of {self.year}".strip()
+
+        parts = []
+
+        if self.matter_type:
+            parts.append(self.matter_type.name)
+
+        if self.number:
+            parts.append(str(self.number))
+
+        if self.year:
+            parts.append(f"of {self.year}" if parts else str(self.year))
+
+        return " ".join(parts)
 
     def save(self, *args, **kwargs):
         self.string = self.get_case_number_string()