diff --git a/composables/masto.ts b/composables/masto.ts
index a4a1fb77..0824b14d 100644
--- a/composables/masto.ts
+++ b/composables/masto.ts
@@ -28,10 +28,6 @@ export const STATUS_VISIBILITIES = [
   },
 ] as const
 
-export function getServerName(account: Account) {
-  return account.url.match(UserLinkRE)?.[1] || currentUser.value?.server || ''
-}
-
 export function getDisplayName(account?: Account, options?: { rich?: boolean }) {
   const displayName = account?.displayName || account?.username || ''
   if (options?.rich)
@@ -45,6 +41,12 @@ export function getShortHandle({ acct }: Account) {
   return `@${acct.includes('@') ? acct.split('@')[0] : acct}`
 }
 
+export function getServerName(account: Account) {
+  if (account.acct.includes('@'))
+    return account.acct.split('@')[1]
+  return account.url.match(UserLinkRE)?.[1] || currentUser.value?.server || ''
+}
+
 export function getFullHandle(account: Account) {
   const handle = `@${account.acct}`
   if (!currentUser.value || account.acct.includes('@'))