1 files changed, 5 insertions, 7 deletions

diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index 2f6bce1c7..3c09332b5 100644
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -208,14 +208,12 @@ class ClientHtml {
   }
 
   static async getActorHTMLPage (nameWithHost: string, req: express.Request, res: express.Response) {
-    const accountModel = await AccountModel.loadByNameWithHost(nameWithHost)
+    const [ account, channel ] = await Promise.all([
+      AccountModel.loadByNameWithHost(nameWithHost),
+      VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithHost)
+    ])
 
-    if (accountModel) {
-      return this.getAccountOrChannelHTMLPage(() => new Promise(resolve => resolve(accountModel)), req, res)
-    } else {
-      const videoChannelModelPromise = VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithHost)
-      return this.getAccountOrChannelHTMLPage(() => videoChannelModelPromise, req, res)
-    }
+    return this.getAccountOrChannelHTMLPage(() => Promise.resolve(account || channel), req, res)
   }
 
   static async getEmbedHTML () {