diff --git a/bothub/common/models.py b/bothub/common/models.py
index 18ae00dd..52aa5061 100644
--- a/bothub/common/models.py
+++ b/bothub/common/models.py
@@ -601,7 +601,8 @@ def available_languages(self, language=None, queryset=None, version_default=True
             )
         else:
             knowledge_bases_languages = list(set(self.knowledge_bases.values_list("texts__language", flat=True)))
-            knowledge_bases_languages.remove(None)
+            if None in knowledge_bases_languages:
+                knowledge_bases_languages.remove(None)
             return knowledge_bases_languages
 
     @property