diff --git a/electron_app/src/tray.js b/electron_app/src/tray.js
index 7198356ca6..98ffb9f40e 100644
--- a/electron_app/src/tray.js
+++ b/electron_app/src/tray.js
@@ -61,7 +61,14 @@ exports.create = function(win, config) {
     trayIcon.on('click', toggleWin);
 
     win.webContents.on('page-favicon-updated', function(ev, favicons) {
-        trayIcon.setImage(nativeImage.createFromDataURL(favicons[0]));
+        if (favicons && favicons.length > 0 && favicons[0].startsWith('data:')) {
+            const image = nativeImage.createFromDataURL(favicons[0]);
+            trayIcon.setImage(image);
+            win.setIcon(image);
+        } else {
+            trayIcon.setImage(config.icon_path);
+            win.setIcon(config.icon_path);
+        }
     });
 
     win.webContents.on('page-title-updated', function(ev, title) {