diff --git a/daemon.py b/daemon.py
index 1b9ddba0..97127124 100644
--- a/daemon.py
+++ b/daemon.py
@@ -705,6 +705,10 @@ class PubServer(BaseHTTPRequestHandler):
             self._write(msg)            
             return
         
+        # replace https://domain/@nick with https://domain/users/nick
+        if self.path.startswith('/@'):
+            self.path=self.path.replace('/@','/users/')
+
         # redirect music to #nowplaying list
         if self.path=='/music' or self.path=='/nowplaying':
             self.path='/tags/nowplaying'
@@ -741,10 +745,6 @@ class PubServer(BaseHTTPRequestHandler):
             if self._requestHTTP():
                 htmlGET=True
 
-        # replace https://domain/@nick with https://domain/users/nick
-        if self.path.startswith('/@'):
-            self.path=self.path.replace('/@','/users/')
-
         # treat shared inbox paths consistently
         if self.path=='/sharedInbox' or \
            self.path=='/users/inbox' or \