diff --git a/app/modules/latency.py b/app/modules/latency.py
index 3990ef8..2dee824 100644
--- a/app/modules/latency.py
+++ b/app/modules/latency.py
@@ -11,23 +11,25 @@ class LatencyModule(niobot.Module):
         """See the bot's latency."""
         latency = ctx.latency
 
-        homeserver = homeserver or await niobot.resolve_homeserver(ctx.message.sender.split(":")[1])
+        homeserver = homeserver or ctx.message.sender.split(":")[1]
         if not homeserver.startswith("http"):
             homeserver = f"https://{homeserver}"
 
         parsed = urllib.parse.urlparse(homeserver)
         loc = "https://" + parsed.netloc
+        homeserver = await niobot.resolve_homeserver(parsed.netloc)
         async with httpx.AsyncClient(headers={"User-Agent": niobot.__user_agent__}) as client:
             timings = []
             for rnd in range(5):
                 start = time.time()
                 try:
-                    res = await client.get(f"{loc}/_matrix/client/v1/ping")
+                    res = await client.get(f"{homeserver}/_matrix/client/v1/ping")
                     res.raise_for_status()
                 except httpx.HTTPError:
                     timings.append(-1)
-                end = time.time()
-                timings.append(end - start)
+                else:
+                    end = time.time()
+                    timings.append(end - start)
             fed_latency = sum(timings) / len(timings) * 1000
 
         hs_target = parsed.hostname