diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor b/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
index 89db8f44..471f2db9 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuItemsHorizontal.razor
@@ -13,10 +13,6 @@
             {
                 _attributes.Add("target", _target);
             }
-            @*if (PageState.RenderMode == RenderModes.Static && PageState.Page.ThemeType != (string.IsNullOrEmpty(childPage.ThemeType) ? PageState.Site.DefaultThemeType : childPage.ThemeType))
-            {
-                _attributes.Add("data-enhance-nav", "false");
-            }*@
             if (childPage.PageId == PageState.Page.PageId)
             {
                 <a class="nav-link active px-3" @attributes="_attributes">
@@ -50,10 +46,6 @@ else
             {
                 _attributes.Add("target", _target);
             }
-            @*if (PageState.RenderMode == RenderModes.Static && PageState.Page.ThemeType != (string.IsNullOrEmpty(childPage.ThemeType) ? PageState.Site.DefaultThemeType : childPage.ThemeType))
-            {
-                _attributes.Add("data-enhance-nav", "false");
-            }*@
             if (!Pages.Any(e => e.ParentId == childPage.PageId))
             {
                 if (childPage.PageId == PageState.Page.PageId)
diff --git a/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor b/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
index 54ee60b7..7508dcda 100644
--- a/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/MenuItemsVertical.razor
@@ -12,10 +12,6 @@
         {
             _attributes.Add("target", _target);
         }
-        @*if (PageState.RenderMode == RenderModes.Static && PageState.Page.ThemeType != (string.IsNullOrEmpty(childPage.ThemeType) ? PageState.Site.DefaultThemeType : childPage.ThemeType))
-        {
-            _attributes.Add("data-enhance-nav", "false");
-        }*@
         if (childPage.PageId == PageState.Page.PageId)
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
@@ -56,10 +52,6 @@ else
             {
                 _attributes.Add("target", _target);
             }
-            @*if (PageState.RenderMode == RenderModes.Static && PageState.Page.ThemeType != (string.IsNullOrEmpty(childPage.ThemeType) ? PageState.Site.DefaultThemeType : childPage.ThemeType))
-            {
-                _attributes.Add("data-enhance-nav", "false");
-            }*@
             if (childPage.PageId == PageState.Page.PageId)
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">