diff --git a/desktop/src/main.js b/desktop/src/main.js
index d9fc2c402..418e5fe8e 100644
--- a/desktop/src/main.js
+++ b/desktop/src/main.js
@@ -1,358 +1,361 @@
 // @flow
 
 import type { Event, MenuItemConstructorOptions } from 'electron';
 import {
   app,
   BrowserWindow,
   shell,
   Menu,
   ipcMain,
   systemPreferences,
   autoUpdater,
   // eslint-disable-next-line import/extensions
 } from 'electron/main';
 import contextMenu from 'electron-context-menu';
 import fs from 'fs';
 import path from 'path';
 
 import { initAutoUpdate } from './auto-update.js';
 import { handleSquirrelEvent } from './handle-squirrel-event.js';
 import {
   listenForNotifications,
   registerForNotifications,
 } from './push-notifications.js';
 
 const isDev = process.env.ENV === 'dev';
 const url = isDev ? 'http://localhost:3000/webapp/' : 'https://web.comm.app';
 const isMac = process.platform === 'darwin';
 
 const scrollbarCSS = fs.promises.readFile(
   path.resolve(__dirname, '../scrollbar.css'),
   'utf8',
 );
 
 let mainWindow = null;
 const setApplicationMenu = () => {
   let mainMenu: MenuItemConstructorOptions[] = [];
   if (isMac) {
     mainMenu = [
       {
         label: app.name,
         submenu: [
           { role: 'about' },
           { type: 'separator' },
           { role: 'services' },
           { type: 'separator' },
           { role: 'hide' },
           { role: 'hideOthers' },
           { role: 'unhide' },
           { type: 'separator' },
           { role: 'quit' },
         ],
       },
     ];
   }
   const viewMenu = {
     label: 'View',
     submenu: [
       { role: 'reload' },
       { type: 'separator' },
       { role: 'resetZoom' },
       { role: 'zoomIn' },
       { role: 'zoomOut' },
       { type: 'separator' },
       { role: 'togglefullscreen' },
       { role: 'toggleDevTools' },
       {
         label: 'Toggle Shared Worker Developer Tools',
         click: () => {
           if (mainWindow) {
             mainWindow.webContents.inspectSharedWorker();
           }
         },
       },
     ],
   };
   const windowMenu = {
     label: 'Window',
     submenu: [
       { role: 'minimize' },
       ...(isMac
         ? [
             { type: 'separator' },
             { role: 'front' },
             { type: 'separator' },
             { role: 'window' },
           ]
         : [{ role: 'close' }]),
     ],
   };
 
   const menu = Menu.buildFromTemplate([
     ...mainMenu,
     { role: 'fileMenu' },
     { role: 'editMenu' },
     viewMenu,
     windowMenu,
   ]);
   Menu.setApplicationMenu(menu);
 };
 
 const createMainWindow = (urlPath?: string) => {
   const win = new BrowserWindow({
     show: false,
     width: 1300,
     height: 800,
     minWidth: 1100,
     minHeight: 600,
     titleBarStyle: 'hidden',
     trafficLightPosition: { x: 20, y: 24 },
     titleBarOverlay: {
       color: '#0A0A0A',
       symbolColor: '#FFFFFF',
       height: 64,
     },
     backgroundColor: '#0A0A0A',
     webPreferences: {
       preload: path.resolve(__dirname, 'preload.js'),
     },
   });
 
   const updateNavigationState = () => {
     win.webContents.send('on-navigate', {
       canGoBack: win.webContents.canGoBack(),
       canGoForward: win.webContents.canGoForward(),
     });
   };
   win.webContents.on('did-navigate-in-page', updateNavigationState);
 
   const clearHistory = () => {
     win.webContents.clearHistory();
     updateNavigationState();
   };
   ipcMain.on('clear-history', clearHistory);
 
   const doubleClickTopBar = () => {
     if (isMac) {
       // Possible values for AppleActionOnDoubleClick are Maximize,
       // Minimize or None. We handle the last two inside this if.
       // Maximize (which is the only behaviour for other platforms)
       // is handled in the later block.
       const action = systemPreferences.getUserDefault(
         'AppleActionOnDoubleClick',
         'string',
       );
       if (action === 'None') {
         return;
       } else if (action === 'Minimize') {
         win.minimize();
         return;
       }
     }
 
     if (win.isMaximized()) {
       win.unmaximize();
     } else {
       win.maximize();
     }
   };
   ipcMain.on('double-click-top-bar', doubleClickTopBar);
 
   const updateDownloaded = (
     event: Event,
     releaseNotes?: string,
     releaseName: string,
   ) => {
     win.webContents.send('on-new-version-available', releaseName);
   };
   autoUpdater.on('update-downloaded', updateDownloaded);
 
   win.on('closed', () => {
     mainWindow = null;
     ipcMain.removeListener('clear-history', clearHistory);
     ipcMain.removeListener('double-click-top-bar', doubleClickTopBar);
     autoUpdater.removeListener('update-downloaded', updateDownloaded);
   });
 
   win.webContents.setWindowOpenHandler(({ url: openURL }) => {
     shell.openExternal(openURL);
     // Returning 'deny' prevents a new electron window from being created
     return { action: 'deny' };
   });
 
   (async () => {
     const css = await scrollbarCSS;
     win.webContents.insertCSS(css);
   })();
 
   win.loadURL(url + (urlPath ?? ''));
   mainWindow = win;
 
   return win;
 };
 
 const createSplashWindow = () => {
   const win = new BrowserWindow({
     width: 300,
     height: 300,
     resizable: false,
     frame: false,
     alwaysOnTop: true,
     center: true,
     backgroundColor: '#111827',
   });
   win.loadFile(path.resolve(__dirname, '../pages/splash.html'));
 
   return win;
 };
 
 const createErrorWindow = () => {
   const win = new BrowserWindow({
     show: false,
     width: 400,
     height: 300,
     resizable: false,
     center: true,
     titleBarStyle: 'hidden',
     trafficLightPosition: { x: 20, y: 24 },
     backgroundColor: '#111827',
   });
   win.on('close', () => {
     app.quit();
   });
   win.loadFile(path.resolve(__dirname, '../pages/error.html'));
 
   return win;
 };
 
 const sendDeviceTokenToWebApp = async () => {
   if (!mainWindow) {
     return;
   }
 
   const token = await registerForNotifications();
   mainWindow?.webContents.send('on-device-token-registered', token);
 };
 
 const show = (urlPath?: string) => {
   const splash = createSplashWindow();
   const error = createErrorWindow();
   const main = createMainWindow(urlPath);
 
   let loadedSuccessfully = true;
   const failedLoadHandler = () => {
     loadedSuccessfully = false;
     if (!splash.isDestroyed()) {
       splash.destroy();
     }
     if (!error.isDestroyed()) {
       error.show();
     }
 
     setTimeout(() => {
       loadedSuccessfully = true;
       main.loadURL(url);
     }, 1000);
   };
 
   main.webContents.on('did-fail-load', failedLoadHandler);
 
   main.webContents.on('did-finish-load', () => {
     if (loadedSuccessfully) {
       if (!splash.isDestroyed()) {
         splash.destroy();
       }
       if (!error.isDestroyed()) {
         error.destroy();
       }
 
       main.webContents.removeListener('did-fail-load', failedLoadHandler);
 
       main.show();
 
       if (app.isPackaged) {
         sendDeviceTokenToWebApp();
       }
     }
   });
 };
 
 const run = () => {
   app.setName('Comm');
   contextMenu({
     showSaveImageAs: true,
     showSaveVideoAs: true,
   });
   if (process.platform === 'win32') {
     app.setAppUserModelId('Comm');
   }
   setApplicationMenu();
 
   (async () => {
     await app.whenReady();
 
+    const handleNotificationClick = (threadID?: string) => {
+      if (mainWindow && threadID) {
+        mainWindow.webContents.send('on-notification-clicked', {
+          threadID,
+        });
+      } else if (threadID) {
+        show(`chat/thread/${threadID}/`);
+      } else {
+        show();
+      }
+    };
+
     if (app.isPackaged) {
       try {
         initAutoUpdate();
       } catch (error) {
         console.error(error);
       }
-
-      listenForNotifications(threadID => {
-        if (mainWindow) {
-          mainWindow.webContents.send('on-notification-clicked', {
-            threadID,
-          });
-        } else {
-          show(`chat/thread/${threadID}/`);
-        }
-      });
+      listenForNotifications(handleNotificationClick);
       ipcMain.on('fetch-device-token', sendDeviceTokenToWebApp);
     }
 
     ipcMain.on('set-badge', (event, value) => {
       if (isMac) {
         app.dock.setBadge(value?.toString() ?? '');
       }
     });
     ipcMain.on('get-version', event => {
       event.returnValue = app.getVersion().toString();
     });
 
     show();
 
     app.on('activate', () => {
       if (BrowserWindow.getAllWindows().length === 0) {
         show();
       }
     });
   })();
 
   app.on('window-all-closed', () => {
     if (!isMac) {
       app.quit();
     }
   });
 
   app.on('render-process-gone', (event, webContents, details) => {
     console.error(
       `EVENT: render-process-gone. Reason: '${details.reason}'. ` +
         `ExitCode: '${details.exitCode}'.`,
     );
   });
 
   app.on('child-process-gone', (event, details) => {
     console.error(
       `EVENT: child-process-gone. Process type: '${details.type}'. ` +
         `Reason: '${details.reason}'. ExitCode: '${details.exitCode}'.`,
     );
   });
 };
 
 if (app.isPackaged && process.platform === 'win32') {
   if (!handleSquirrelEvent()) {
     run();
   }
 } else {
   run();
 }
diff --git a/desktop/src/push-notifications.js b/desktop/src/push-notifications.js
index 652b5a34f..444ee2843 100644
--- a/desktop/src/push-notifications.js
+++ b/desktop/src/push-notifications.js
@@ -1,126 +1,141 @@
 // @flow
 
 import type {
   PushNotificationManager as PushNotificationManagerType,
   PushNotificationReceivedEventArgs,
 } from '@commapp/windowspush';
 // eslint-disable-next-line import/extensions
 import { app, pushNotifications, Notification } from 'electron/main';
 import EventEmitter from 'events';
 import { resolve } from 'path';
 
 import { isNormalStartup } from './handle-squirrel-event.js';
 
 let windowsPushNotificationManager;
 const windowsPushNotifEventEmitter = new EventEmitter();
 if (process.platform === 'win32' && app.isPackaged && isNormalStartup()) {
   (async () => {
     try {
       const { PushNotificationManager } = await import('@commapp/windowspush');
 
       if (!PushNotificationManager.isSupported()) {
         return;
       }
 
       windowsPushNotificationManager = PushNotificationManager.default;
 
       const handleEvent = (
         manager: PushNotificationManagerType,
         event: PushNotificationReceivedEventArgs,
       ) => {
         const byteArray = [];
         for (let i = 0; i < event.payload.length; i++) {
           byteArray.push(event.payload[i]);
         }
         const payload = Buffer.from(byteArray).toString('utf-8');
         windowsPushNotifEventEmitter.emit(
           'received-wns-notification',
           JSON.parse(payload),
         );
       };
 
       // Windows requires that this must be called before the call to `register`
       windowsPushNotificationManager.addListener('PushReceived', handleEvent);
 
       windowsPushNotificationManager.register();
 
       app.on('quit', () => {
         windowsPushNotificationManager.removeListener(
           'PushReceived',
           handleEvent,
         );
         windowsPushNotificationManager.unregisterAll();
       });
     } catch (err) {
       console.error(
         `Error while loading windows push notifications ${err.message}`,
       );
     }
   })();
 }
 
 async function registerForNotifications(): Promise<?string> {
   if (process.platform === 'darwin') {
     try {
       const token = await pushNotifications.registerForAPNSNotifications();
       return token;
     } catch (err) {
       console.error(err);
     }
   } else if (process.platform === 'win32' && windowsPushNotificationManager) {
     try {
       const token = await new Promise<string>((resolvePromise, reject) => {
         windowsPushNotificationManager.createChannelAsync(
           'f09f4211-a998-40c1-a515-689e3faecb62',
           (error, result) => {
             if (error) {
               reject(error);
             }
             resolvePromise(result.channel.uri);
           },
         );
       });
 
       return token;
     } catch (err) {
       console.error(err);
     }
   }
 
   return null;
 }
 
 function showNewNotification(
   payload: { +[string]: mixed },
-  handleClick: (threadID: string) => void,
+  handleClick: (threadID?: string) => void,
 ) {
+  const windowsIconPath = resolve(__dirname, '../icons/icon.ico');
+  if (
+    typeof payload.error === 'string' &&
+    typeof payload.displayErrorMessage === 'boolean'
+  ) {
+    const notif = new Notification({
+      title: 'Comm notification',
+      body: payload.displayErrorMessage ? payload.error : undefined,
+      icon: process.platform === 'win32' ? windowsIconPath : undefined,
+    });
+
+    notif.on('click', () => handleClick());
+    notif.show();
+    return;
+  }
+
   if (
     typeof payload.title !== 'string' ||
     typeof payload.body !== 'string' ||
     typeof payload.threadID !== 'string'
   ) {
     return;
   }
   const { title, body, threadID } = payload;
-  const windowsIconPath = resolve(__dirname, '../icons/icon.ico');
   const notif = new Notification({
     title,
     body,
     icon: process.platform === 'win32' ? windowsIconPath : undefined,
   });
   notif.on('click', () => handleClick(threadID));
   notif.show();
 }
 
-function listenForNotifications(handleClick: (threadID: string) => void) {
+function listenForNotifications(handleClick: (threadID?: string) => void) {
   if (process.platform === 'darwin') {
     pushNotifications.on('received-apns-notification', (event, userInfo) => {
       showNewNotification(userInfo, handleClick);
     });
   } else if (process.platform === 'win32') {
     windowsPushNotifEventEmitter.on('received-wns-notification', payload => {
       showNewNotification(payload, handleClick);
     });
   }
 }
 export { listenForNotifications, registerForNotifications };