diff --git a/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js b/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
index 44b4d75cf9..ab0bf16345 100644
--- a/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
+++ b/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
@@ -23,7 +23,10 @@ export const ModifiedTabs = ({
       onNewTab();
       setTimeout(() => {
         // set focus to the new tab
-        tabsRef.current.getTabAt(tabs.length)?.tabAnchor?.focus();
+        const tab = tabsRef.current.getTabAt(tabs.length);
+        if (tab & tab.tabAnchor) {
+          tab.tabAnchor.focus();
+        }
       });
     }
   };
diff --git a/packages/experimental/src/components/TagSet/TagSet.js b/packages/experimental/src/components/TagSet/TagSet.js
index 1ab0b53e5c..3d882646d9 100644
--- a/packages/experimental/src/components/TagSet/TagSet.js
+++ b/packages/experimental/src/components/TagSet/TagSet.js
@@ -91,7 +91,9 @@ export const TagSet = ({
     if (showAllModalOpen) {
       const newFilteredAllTags = [];
       children.forEach((child) => {
-        const dataSearch = child.props['data-search']?.toLocaleLowerCase();
+        const dataSearch = (
+          child.props['data-search'] || ''
+        ).toLocaleLowerCase();
         const contentsAsString = child.props.children
           .toString()
           .toLocaleLowerCase();
@@ -179,9 +181,11 @@ export const TagSet = ({
   };
 
   const handleClickOutsideCheck = (ev) => {
-    const tooltipEl = overflowTagContent.current?.parentElement?.parentElement;
+    const tooltipEl =
+      overflowTagContent.current &&
+      overflowTagContent.current.parentElement.parentElement;
     if (
-      tooltipEl !== undefined &&
+      tooltipEl &&
       (tooltipEl === ev.target || tooltipEl.contains(ev.target))
     ) {
       // inside click