diff --git a/daemon.py b/daemon.py
index 7e3439220..2708f8ff6 100644
--- a/daemon.py
+++ b/daemon.py
@@ -21639,7 +21639,8 @@ def load_tokens(base_dir: str, tokens_dict: {}, tokens_lookup: {}) -> None:
         break
 
 
-def run_daemon(map_format: str,
+def run_daemon(max_hashtags: int,
+               map_format: str,
                clacks: str,
                preferred_podcast_formats: [],
                check_actor_timeout: int,
@@ -22212,7 +22213,7 @@ def run_daemon(map_format: str,
 
     httpd.max_mentions = max_mentions
     httpd.max_emoji = max_emoji
-    httpd.max_hashtags = 20
+    httpd.max_hashtags = max_hashtags
 
     print('THREAD: Creating inbox queue')
     httpd.thrInboxQueue = \
diff --git a/epicyon.py b/epicyon.py
index 4ab1cec28..7529345a2 100644
--- a/epicyon.py
+++ b/epicyon.py
@@ -592,6 +592,9 @@ def _command_options() -> None:
     parser.add_argument('--max_like_count', dest='max_like_count', type=int,
                         default=10,
                         help='Maximum number of likes displayed on a post')
+    parser.add_argument('--max_hashtags', dest='max_hashtags', type=int,
+                        default=20,
+                        help='Maximum number of hashtags on a post')
     parser.add_argument('--votingtime', dest='votingtime', type=int,
                         default=1440,
                         help='Time to vote on newswire items in minutes')
@@ -3672,7 +3675,8 @@ def _command_options() -> None:
 if __name__ == "__main__":
     argb2, opt2 = _command_options()
     print('allowdeletion: ' + str(argb2.allowdeletion))
-    run_daemon(argb2.mapFormat,
+    run_daemon(argb2.max_hashtags,
+               argb2.mapFormat,
                argb2.clacks,
                opt2['preferred_podcast_formats'],
                argb2.check_actor_timeout,
diff --git a/tests.py b/tests.py
index 5f0251a5e..86bc6501b 100644
--- a/tests.py
+++ b/tests.py
@@ -844,8 +844,9 @@ def create_server_alice(path: str, domain: str, port: int,
     preferred_podcast_formats = None
     clacks = None
     map_format = 'gpx'
+    max_hashtags = 20
     print('Server running: Alice')
-    run_daemon(map_format,
+    run_daemon(max_hashtags, map_format,
                clacks, preferred_podcast_formats,
                check_actor_timeout,
                crawlers_allowed,
@@ -1007,8 +1008,9 @@ def create_server_bob(path: str, domain: str, port: int,
     preferred_podcast_formats = None
     clacks = None
     map_format = 'gpx'
+    max_hashtags = 20
     print('Server running: Bob')
-    run_daemon(map_format,
+    run_daemon(max_hashtags, map_format,
                clacks, preferred_podcast_formats,
                check_actor_timeout,
                crawlers_allowed,
@@ -1092,8 +1094,9 @@ def create_server_eve(path: str, domain: str, port: int, federation_list: [],
     preferred_podcast_formats = None
     clacks = None
     map_format = 'gpx'
+    max_hashtags = 20
     print('Server running: Eve')
-    run_daemon(map_format,
+    run_daemon(max_hashtags, map_format,
                clacks, preferred_podcast_formats,
                check_actor_timeout,
                crawlers_allowed,
@@ -1179,8 +1182,9 @@ def create_server_group(path: str, domain: str, port: int,
     preferred_podcast_formats = None
     clacks = None
     map_format = 'gpx'
+    max_hashtags = 20
     print('Server running: Group')
-    run_daemon(map_format,
+    run_daemon(max_hashtags, map_format,
                clacks, preferred_podcast_formats,
                check_actor_timeout,
                crawlers_allowed,