diff --git a/src/electron/tray.main.ts b/src/electron/tray.main.ts
index bed712f5aa7..e34c54b7dac 100644
--- a/src/electron/tray.main.ts
+++ b/src/electron/tray.main.ts
@@ -86,7 +86,9 @@ export class TrayMain {
     }
 
     removeTray(showWindow = true) {
-        if (this.tray != null) {
+        // Due to https://github.com/electron/electron/issues/17622
+        // we cannot destroy the tray icon on linux.
+        if (this.tray != null && process.platform !== 'linux') {
             this.tray.destroy();
             this.tray = null;
         }