diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 0170743af2a..3a3d62158cb 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -111,7 +111,7 @@ rules:
       pre, blockquote, li, br, emojis, chatboxes, userlist, middleware, trunc, pushable,
       ios, md, caughtup, autocompleted, substring, png, ds, videocam, unmount, github,
       facebook, idx, aaa, bbb, ccc, ddd, eee, fff, abcd, aaaaaa, ffffff, 24cac2, src,
-      attribs, charset, utf, urlencoded, htmlparser, ul, ol, chatbubbles,
+      attribs, charset, utf, urlencoded, htmlparser, ul, ol, chatbubbles, vimeo,
       nonexisting, primarytext, autocomple, stringify, backend, Zoe, Menlo, ok, py,
       todo, Mc, lodash, selectable, isequal, lightgray, tc, zulipchat, prepend, pierre,
       allen, jan, donald, jane, unicode, joe, unescape, dan, abramov, lang, bool,
@@ -121,7 +121,7 @@ rules:
       gcm, unstarMessage, Unstar, wildcard_mentioned, lightbox, resize, remobile, tz,
       multiline, uniqby, zoe, localizable, appid, apns, Entypo, msup, mrow, webview,
       js, timerow, reselect, addons, cancelable, gravatar_hash, pms, msgs, collapsable,
-      const, wildcard, reactotron, camelcase, hydrator, perf, stacktrace, Dir, fs,
+      const, wildcard, reactotron, camelcase, hydrator, perf, stacktrace, Dir, fs, youtube,
       avoider, octicons, centerer, ldap, gravatar, identicon, blueimp, filename, wildcards,
       jpeg, jpg, tif, mov, notif, diag, bmp, viewport, scalable, polyfill, rect, touchstart,
       touchend, touchmove, remoteuser, sso, submessages, nbsp, args, px, na, heic,
diff --git a/src/webview/js/generatedEs3.js b/src/webview/js/generatedEs3.js
index 4aa9527c5e0..2cbf1d1fa06 100644
--- a/src/webview/js/generatedEs3.js
+++ b/src/webview/js/generatedEs3.js
@@ -300,7 +300,7 @@ documentBody.addEventListener('click', function (e) {
     return;
   }
 
-  if (e.target.matches('a[target="_blank"] > img')) {
+  if (e.target.matches('a[target="_blank"] > img') && !e.target.matches('.youtube-video > a[target="_blank"] > img') && !e.target.matches('.vimeo-video > a[target="_blank"] > img')) {
     sendMessage({
       type: 'image',
       src: e.target.parentNode.getAttribute('href'),
diff --git a/src/webview/js/js.js b/src/webview/js/js.js
index cd504015e36..5dab1b3c263 100644
--- a/src/webview/js/js.js
+++ b/src/webview/js/js.js
@@ -340,7 +340,11 @@ documentBody.addEventListener('click', e => {
     return;
   }
 
-  if (e.target.matches('a[target="_blank"] > img')) {
+  if (
+    e.target.matches('a[target="_blank"] > img')
+    && !e.target.matches('.youtube-video > a[target="_blank"] > img')
+    && !e.target.matches('.vimeo-video > a[target="_blank"] > img')
+  ) {
     sendMessage({
       type: 'image',
       src: e.target.parentNode.getAttribute('href'),