diff --git a/daemon_get_post.py b/daemon_get_post.py
index 97eda0762..9c7281bd0 100644
--- a/daemon_get_post.py
+++ b/daemon_get_post.py
@@ -1289,7 +1289,9 @@ def show_conversation_thread(self, authorized: bool,
         return False
     conv_separator = '?convthread='
     # https://codeberg.org/fediverse/fep/src/branch/main/fep/76ea/fep-76ea.md
-    if conv_separator not in path and '/thread/' in path:
+    if conv_separator not in path and \
+       '/thread/' in path and \
+       '?reply' not in path:
         convthread_id = path.split('/thread/', 1)[1].strip()
         if convthread_id.isdigit():
             new_tag = convthread_id_to_conversation_tag(domain_full,
diff --git a/httpheaders.py b/httpheaders.py
index 9289788f4..25277b4b1 100644
--- a/httpheaders.py
+++ b/httpheaders.py
@@ -77,10 +77,6 @@ def redirect_headers(self, redirect: str, cookie: str,
                      calling_domain: str,
                      code: int) -> None:
     if '://' not in redirect:
-        if redirect.startswith('tag:'):
-            # conversation redirect
-            conv_separator = '?convthread='
-            redirect = conv_separator + redirect
         redirect = \
             get_instance_url(calling_domain,
                              self.server.http_prefix,