diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index bee8e95137..1a40fde26f 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -188,7 +188,8 @@ const escapeRegExp = function(string) {
 matrixLinkify.ELEMENT_URL_PATTERN =
     "^(?:https?://)?(?:" +
         escapeRegExp(window.location.host + window.location.pathname) + "|" +
-        "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/" +
+        "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/|" +
+        "(?:app|beta|staging|develop)\\.element\\.io/" +
     ")(#.*)";
 
 matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?://)?(?:www\\.)?matrix\\.to/#/(([#@!+]).*)";