diff --git a/electron_app/src/webcontents-handler.js b/electron_app/src/webcontents-handler.js
index bbfb2e7da7..f0aaf4a4f1 100644
--- a/electron_app/src/webcontents-handler.js
+++ b/electron_app/src/webcontents-handler.js
@@ -174,7 +174,8 @@ function onEditableContextMenu(ev, params) {
 
 module.exports = (webContents) => {
     webContents.on('new-window', onWindowOrNavigate);
-    webContents.on('will-navigate', onWindowOrNavigate);
+    // XXX: https://github.com/vector-im/riot-web/issues/8247
+    // webContents.on('will-navigate', onWindowOrNavigate);
 
     webContents.on('context-menu', function(ev, params) {
         if (params.linkURL || params.srcURL) {