diff --git a/daemon.py b/daemon.py
index 67c796757..05c48e558 100644
--- a/daemon.py
+++ b/daemon.py
@@ -2141,7 +2141,8 @@ class PubServer(BaseHTTPRequestHandler):
                     self.path = self.path.split('?')[0]
                 # show the search screen
                 msg = htmlSearch(self.server.translate,
-                                 self.server.baseDir, self.path).encode()
+                                 self.server.baseDir, self.path,
+                                 self.server.domain).encode()
                 self._set_headers('text/html', len(msg), cookie, callingDomain)
                 self._write(msg)
                 self.server.GETbusy = False
diff --git a/webinterface.py b/webinterface.py
index c9736fca2..69c42c2c4 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -5848,12 +5848,11 @@ def htmlHashTagSwarm(baseDir: str, actor: str) -> str:
 
 
 def htmlSearch(translate: {},
-               baseDir: str, path: str) -> str:
+               baseDir: str, path: str, domain: str) -> str:
     """Search called from the timeline icon
     """
     actor = path.replace('/search', '')
     searchNickname = getNicknameFromActor(actor)
-    domain, port = getDomainFromActor(actor)
 
     if os.path.isfile(baseDir + '/img/search-background.png'):
         if not os.path.isfile(baseDir + '/accounts/search-background.png'):