diff --git a/src/matrix-to.js b/src/matrix-to.js
index 1c94a9e78c..b3fe10a215 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -241,8 +241,11 @@ export function makeRoomPermalink(roomId) {
     // Aliases are already routable, and don't need extra information.
     if (roomId[0] !== '!') return permalinkBase;
 
-    const serverCandidates = pickServerCandidates(roomId);
-    return `${permalinkBase}${encodeServerCandidates(serverCandidates)}`;
+    const client = MatrixClientPeg.get();
+    const room = client.getRoom(roomId);
+    const permaLinkCreator = new RoomPermaLinkCreator(room);
+    permaLinkCreator.load();
+    return permaLinkCreator.forRoom();
 }
 
 export function makeGroupPermalink(groupId) {