From 8b533bb4316a4998e85563f2cb3497ca93ad749d Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Thu, 23 Feb 2017 14:18:07 -0700
Subject: [PATCH] Fixes #5474

---
 src/webserver.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webserver.js b/src/webserver.js
index f6c89b5451..9b3e816c5d 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -159,7 +159,8 @@ function setupExpressApp(app) {
 }
 
 function setupFavicon(app) {
-	var faviconPath = path.join(nconf.get('base_dir'), 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico');
+	var faviconPath = meta.config['brand:favicon'] || 'favicon.ico';
+	faviconPath = path.join(nconf.get('base_dir'), 'public', faviconPath.replace(/assets\/uploads/, 'uploads'));
 	if (file.existsSync(faviconPath)) {
 		app.use(nconf.get('relative_path'), favicon(faviconPath));
 	}