diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 585c1255a4..97bfc30f14 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -666,15 +666,13 @@ class BrowseServer(object):
             if add_category_links:
                 added_key = False
                 fm = mi.metadata_for_field(key)
-                if val and fm and fm['is_category'] and \
+                if val and fm and fm['is_category'] and not fm['is_csp'] and\
                         key != 'formats' and fm['datatype'] not in ['rating']:
                     categories = mi.get(key)
                     if isinstance(categories, basestring):
                         categories = [categories]
                     dbtags = []
                     for category in categories:
-                        if category not in ccache:
-                            continue
                         dbtag = None
                         for tag in ccache[key]:
                             if tag.name == category: