diff --git a/r2/r2/lib/cloudsearch.py b/r2/r2/lib/cloudsearch.py
index 09a272677..c15857eb8 100644
--- a/r2/r2/lib/cloudsearch.py
+++ b/r2/r2/lib/cloudsearch.py
@@ -256,6 +256,10 @@ class LinkUploader(CloudSearchUploader):
                 # UrlParser couldn't handle thing.url, oh well
                 pass
         
+        if thing.flair_css_class or thing.flair_text:
+            fields['flair_css_class'] = thing.flair_css_class or ''
+            fields['flair_text'] = thing.flair_text or ''
+        
         return fields
     
     def batch_lookups(self):