diff --git a/src/extensions/expiryIndicator/ExpiryIndicatorFieldCustomizer.ts b/src/extensions/expiryIndicator/ExpiryIndicatorFieldCustomizer.ts
index 81bd47b..391e9f2 100644
--- a/src/extensions/expiryIndicator/ExpiryIndicatorFieldCustomizer.ts
+++ b/src/extensions/expiryIndicator/ExpiryIndicatorFieldCustomizer.ts
@@ -172,7 +172,9 @@ export default class ExpiryIndicatorFieldCustomizer
     let level: number = 0;
     while (current && level < 16) {
       const className: string = typeof current.className === 'string' ? current.className : '';
-      if (current.getAttribute('role') === 'row' || className.indexOf('ms-DetailsRow') >= 0) {
+      const classes: string[] = className ? className.split(/\s+/) : [];
+      if (current.getAttribute('data-automationid') === 'DetailsRow' ||
+        current.getAttribute('role') === 'row' || classes.indexOf('ms-DetailsRow') >= 0) {
         return current;
       }
       current = current.parentElement;