diff --git a/solutions/scripts/aem-perf-marks.js b/solutions/scripts/aem-perf-marks.js
index 299a564cb..d97dfd66d 100644
--- a/solutions/scripts/aem-perf-marks.js
+++ b/solutions/scripts/aem-perf-marks.js
@@ -39,7 +39,7 @@ const observer = new MutationObserver((mutations) => {
     const { target } = mutation;
     // console.debug('MutationObserver', target); // eslint-disable-line no-console
     if (target.dataset.sectionStatus || target.dataset.blockStatus) {
-      const markName = target.classList.join('_');
+      const markName = target.classList ? target.classList.join('_') : target.id;
       const status = target.dataset.sectionStatus || target.dataset.blockStatus;
       if (status === 'initialized') {
         window.PerfMarks.create(markName, { section: target.id });