diff --git a/includes/Optimizations.php b/includes/Optimizations.php
index dc1f84a..e6f2f1f 100644
--- a/includes/Optimizations.php
+++ b/includes/Optimizations.php
@@ -72,7 +72,7 @@ public function get_options() {
                 'self_ping'      => true,
                 'comments'       => false,
                 'jquery_migrate' => true,
-                'clean_nav_menu' => true,
+                'clean_nav_menu' => false,
                 'rss_feed'       => false,
                 'xmlrpc'         => true,
             ],
diff --git a/includes/Optimizations/General.php b/includes/Optimizations/General.php
index 8394715..22f6c81 100644
--- a/includes/Optimizations/General.php
+++ b/includes/Optimizations/General.php
@@ -119,6 +119,10 @@ public function remove_jquery_migrate() {
      */
     public function clean_nav_menu() {
         add_filter( 'nav_menu_css_class', function ( $classes ) {
+            if ( ! is_array( $classes ) ) {
+                return $classes;
+            }
+
             return array_intersect( $classes, [
                 'current-menu-item',
                 'menu-item-has-children',
@@ -126,8 +130,6 @@ public function clean_nav_menu() {
                 'current-menu-ancestor',
             ] );
         } );
-
-        add_filter( 'nav_menu_item_id', '__return_null' );
     }
 
     /**