diff --git a/src/App.scss b/src/App.scss
index 0bdc88735..78c20c0f9 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -498,6 +498,8 @@ nav {
   box-sizing: content-box;
   color: inherit;
 
+  --shadow: none;
+
   &.-link {
     /* stylelint-disable-next-line declaration-no-important */
     color: var(--link) !important;
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index 670d482d8..d4f88e883 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -567,6 +567,9 @@ export const init = ({
       if (!liteMode && combination.state.indexOf('hover') >= 0) {
         combination.lazy = true
       }
+      if (extraCompileComponents.has(component.name)) {
+        combination.lazy = true
+      }
 
       combinations.push(combination)