diff --git a/content.py b/content.py
index 15387c926..1d8334412 100644
--- a/content.py
+++ b/content.py
@@ -389,8 +389,6 @@ def validHashTag(hashtag: str) -> bool:
                      'ŴŵÝýŸÿŶŷŹźŽžŻż')
     if set(hashtag).issubset(validChars):
         return True
-    if '#' in hashtag or '"' in hashtag or '&' in hashtag:
-        return False
     if isValidLanguage(hashtag):
         return True
     return False
diff --git a/webapp_hashtagswarm.py b/webapp_hashtagswarm.py
index 19f08661f..f2ffb577d 100644
--- a/webapp_hashtagswarm.py
+++ b/webapp_hashtagswarm.py
@@ -203,8 +203,12 @@ def htmlHashTagSwarm(baseDir: str, actor: str, translate: {}) -> str:
                             categoryStr = \
                                 getHashtagCategory(baseDir, hashTagName)
                             if len(categoryStr) < maxTagLength:
-                                if categoryStr not in categorySwarm:
-                                    categorySwarm.append(categoryStr)
+                                if '#' not in categoryStr and \
+                                   '&' not in categoryStr and \
+                                   '"' not in categoryStr and \
+                                   "'" not in categoryStr:
+                                    if categoryStr not in categorySwarm:
+                                        categorySwarm.append(categoryStr)
                         break
         break