diff --git a/web-ui/src/components/certifications/EarnedCertificationsTable.jsx b/web-ui/src/components/certifications/EarnedCertificationsTable.jsx
index 814a62ec85..6b2b16992d 100644
--- a/web-ui/src/components/certifications/EarnedCertificationsTable.jsx
+++ b/web-ui/src/components/certifications/EarnedCertificationsTable.jsx
@@ -329,7 +329,10 @@ const EarnedCertificationsTable = ({
             }}
           />
           <DatePickerField
-            date={new Date(selectedEarned?.earnedDate)}
+            date={selectedEarned?.expirationDate
+                  ? new Date(selectedEarned?.expirationDate)
+                  : null
+                 }
             label="Expiration"
             setDate={date => {
               setSelectedEarned({