diff --git a/plugins/TagSub/TagSub.php b/plugins/TagSub/TagSub.php
index c2da072693..9662811bf9 100644
--- a/plugins/TagSub/TagSub.php
+++ b/plugins/TagSub/TagSub.php
@@ -147,7 +147,7 @@ class TagSub extends Managed_DataObject
         $keypart = sprintf('tagsub:by_profile:%d', $profile->id);
         $tagstring = self::cacheGet($keypart);
         
-        if ($tagstring !== false) {
+        if ($tagstring !== false && !empty($tagstring)) {
             $tags = explode(',', $tagstring);
         } else {
             $tagsub = new TagSub();
@@ -155,7 +155,9 @@ class TagSub extends Managed_DataObject
 
             if ($tagsub->find()) {
                 while ($tagsub->fetch()) {
-                    $tags[] = $tagsub->tag;
+                    if (!empty($tagsub->tag)) {
+                        $tags[] = $tagsub->tag;
+                    }
                 }
             }
 
diff --git a/plugins/TagSub/tagsubmenu.php b/plugins/TagSub/tagsubmenu.php
index e2ddf04ef9..e57a8a8a97 100644
--- a/plugins/TagSub/tagsubmenu.php
+++ b/plugins/TagSub/tagsubmenu.php
@@ -62,12 +62,14 @@ class TagSubMenu extends Menu
         $this->out->elementStart('ul', array('class' => 'nav'));
 
         foreach ($this->tags as $tag) {
+            if (!empty($tag)) {
                 $this->out->menuItem(common_local_url('tag',
                                                       array('tag' => $tag)),
                                      sprintf('#%s', $tag),
                                      sprintf(_('Notices tagged with %s'), $tag),
                                      $this->actionName == 'tag' && $this->action->arg('tag') == $tag,
                                      'nav_streams_tag_'.$tag);
+            }
         }
 
         $this->out->elementEnd('ul');