diff --git a/lib/nav.php b/lib/nav.php
index 493e562..af24dbb 100644
--- a/lib/nav.php
+++ b/lib/nav.php
@@ -86,10 +86,6 @@ function roots_nav_menu_args($args = '') {
     $roots_nav_menu_args['depth'] = 2;
   }
 
-  if (!$args['walker']) {
-    $roots_nav_menu_args['walker'] = new Roots_Nav_Walker();
-  }
-
   return array_merge($args, $roots_nav_menu_args);
 }
 add_filter('wp_nav_menu_args', 'roots_nav_menu_args');
diff --git a/templates/header.php b/templates/header.php
index 6639eb7..9c2e7f2 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -13,7 +13,7 @@
     <nav class="collapse navbar-collapse" role="navigation">
       <?php
         if (has_nav_menu('primary_navigation')) :
-          wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav navbar-nav'));
+          wp_nav_menu(array('theme_location' => 'primary_navigation', 'walker' => new Roots_Nav_Walker(), 'menu_class' => 'nav navbar-nav'));
         endif;
       ?>
     </nav>