diff --git a/src/controllers/pages/MatrixChat.js b/src/controllers/pages/MatrixChat.js
index e56d835267..e1f6afb95e 100644
--- a/src/controllers/pages/MatrixChat.js
+++ b/src/controllers/pages/MatrixChat.js
@@ -70,10 +70,12 @@ module.exports = {
 
         // this can technically be done anywhere but doing this here keeps all
         // the routing url path logic together.
-        linkifyMatrix.onAliasClick = function(event, alias) {
-            dis.dispatch({action: 'view_room_alias', room_alias: alias});
-            event.preventDefault();
-        };
+        if (this.onAliasClick) {
+            linkifyMatrix.onAliasClick = this.onAliasClick;
+        }
+        if (this.onUserClick) {
+            linkifyMatrix.onUserClick = this.onUserClick;
+        }
     },
 
     componentWillUnmount: function() {