diff --git a/src/views/domains.js b/src/views/domains.js
index 792ec37f2..129f9f808 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -184,7 +184,14 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                         'preferredDomain': $scope.domainWellKnown.jitsiHostname
                     }
                 });
+            } else if ($scope.domainWellKnown.jitsiHostname) { // only if matrixHostname is not set
+                wellKnown['matrix/client'] = JSON.stringify({
+                    'im.vector.riot.jitsi': {
+                        'preferredDomain': $scope.domainWellKnown.jitsiHostname
+                    }
+                });
             }
+
             if ($scope.domainWellKnown.mastodonHostname) {
                 wellKnown['host-meta'] = '<?xml version="1.0" encoding="UTF-8"?>\n'
                     + '<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">\n'