diff --git a/.eslintrc b/.eslintrc
index cb9fff6bc19..9392bee07f1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -91,7 +91,7 @@
     "jsx-a11y/no-redundant-roles": "error",
     "jsx-a11y/no-static-element-interactions": "off",
     "jsx-a11y/role-has-required-aria-props": "off",
-    "jsx-a11y/role-supports-aria-props": "off",
+    "jsx-a11y/role-supports-aria-props": "error",
     "jsx-a11y/scope": "error",
     "jsx-a11y/tabindex-no-positive": "error"
   },
diff --git a/public/app/core/components/NavBar/NavBarMenuItem.tsx b/public/app/core/components/NavBar/NavBarMenuItem.tsx
index 0b45bb7bcda..173f1bb2f1a 100644
--- a/public/app/core/components/NavBar/NavBarMenuItem.tsx
+++ b/public/app/core/components/NavBar/NavBarMenuItem.tsx
@@ -65,7 +65,7 @@ export function NavBarMenuItem({
 
   if (isMobile) {
     return isDivider ? (
-      <li data-testid="dropdown-child-divider" className={styles.divider} tabIndex={-1} aria-disabled />
+      <div data-testid="dropdown-child-divider" className={styles.divider} tabIndex={-1} aria-disabled />
     ) : (
       <li className={styles.listItem}>{element}</li>
     );