diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 9ec5b9fd19..3da86944d7 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -44,7 +44,7 @@ app.use(views(__dirname + '/views', {
 }));
 
 // Serve favicon
-app.use(favicon(`${client}/assets/favicon.png`));
+app.use(favicon(`${__dirname}/../../../assets/favicon.png`));
 
 // Common request handler
 app.use(async (ctx, next) => {
diff --git a/src/server/web/views/base.pug b/src/server/web/views/base.pug
index d1a31275bc..7ca196a34c 100644
--- a/src/server/web/views/base.pug
+++ b/src/server/web/views/base.pug
@@ -13,7 +13,7 @@ html
 		meta(name='theme-color' content='#86b300')
 		meta(property='og:site_name' content= instanceName || 'Misskey')
 		meta(name='viewport' content='width=device-width, initial-scale=1')
-		link(rel='icon' href= icon || '/favicon.png')
+		link(rel='icon' href= icon || '/favicon.ico')
 		link(rel='apple-touch-icon' href= icon || '/apple-touch-icon.png')
 		link(rel='manifest' href='/manifest.json')