diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php
index 13e525bb62..8fbb113362 100644
--- a/plugins/TagSub/TagSubPlugin.php
+++ b/plugins/TagSub/TagSubPlugin.php
@@ -252,15 +252,6 @@ class TagSubPlugin extends Plugin
             $menu->submenu(_m('Tags'), $tagSubMenu);
         }
 
-        foreach ($tags as $tag) {
-                $menu->out->menuItem(common_local_url('tag',
-                                                      array('tag' => $tag)),
-                                     sprintf('#%s', $tag),
-                                     sprintf(_('Notices tagged with %s'), $tag),
-                                     $menu->actionName == 'tag' && $menu->action->arg('tag') == $tag,
-                                     'nav_streams_tag_'.$tag);
-        }
-
         return true;
     }
 
diff --git a/plugins/TagSub/tagsubmenu.php b/plugins/TagSub/tagsubmenu.php
index 44770651d9..e2ddf04ef9 100644
--- a/plugins/TagSub/tagsubmenu.php
+++ b/plugins/TagSub/tagsubmenu.php
@@ -61,7 +61,7 @@ class TagSubMenu extends Menu
     {
         $this->out->elementStart('ul', array('class' => 'nav'));
 
-        foreach ($tags as $tag) {
+        foreach ($this->tags as $tag) {
                 $this->out->menuItem(common_local_url('tag',
                                                       array('tag' => $tag)),
                                      sprintf('#%s', $tag),