diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 8e3da9964..6b1de74cc 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -2559,8 +2559,8 @@ class FlairSelector(CachedTemplate):
         position = getattr(c.site, 'flair_position', 'right')
 
         attr_pattern = 'flair_%s_%%s' % c.site._id
-        text = getattr(c.user, attr_pattern % 'text')
-        css_class = getattr(c.user, attr_pattern % 'css_class')
+        text = getattr(c.user, attr_pattern % 'text', '')
+        css_class = getattr(c.user, attr_pattern % 'css_class', '')
 
         ids = FlairTemplateBySubredditIndex.get_template_ids(c.site._id)
         # TODO(intortus): Maintain sorting.
diff --git a/r2/r2/templates/flairselector.html b/r2/r2/templates/flairselector.html
index 8721d2e73..6d7af2018 100644
--- a/r2/r2/templates/flairselector.html
+++ b/r2/r2/templates/flairselector.html
@@ -22,7 +22,7 @@
 
 <h2>${_("select flair")}</h2>
 <ul>
-  %if c.site.flair_self_assign_enabled:
+  %if thing.choices and c.site.flair_self_assign_enabled:
     %for choice in thing.choices:
       <%
         li_class = 'flairsample-%s' % thing.position
@@ -34,8 +34,6 @@
       </li>
     %endfor
   %else:
-    <li class="error">
-      ${_("flair selection unavailable")}
-    </li>
+    <li class="error">${_("flair selection unavailable")}</li>
   %endif
 </ul>