diff --git a/src/views/components/common/Chip.tsx b/src/views/components/common/Chip.tsx
index edd5c20e..c8ff05af 100644
--- a/src/views/components/common/Chip.tsx
+++ b/src/views/components/common/Chip.tsx
@@ -9,7 +9,7 @@ export const flagMap = {
     Writing: 'WR',
     'Quantitative Reasoning': 'QR',
     'Global Cultures': 'GC',
-    'Cultural Diversity in the United States': 'CD',
+    'Cultural Diversity': 'CD',
     Ethics: 'E',
     'Independent Inquiry': 'II',
 } as const satisfies Record<string, Flag>;
@@ -31,7 +31,7 @@ export function Chip({ label }: React.PropsWithChildren<Props>): JSX.Element {
             style={{
                 backgroundColor: '#FFD600',
             }}
-            title={Object.entries(flagMap).find(([full, short]) => short === label)![0]}
+            title={Object.entries(flagMap).find(([full, short]) => short === label)?.[0] ?? label}
         >
             {label}
         </Text>