diff --git a/src/domain/session/room/timeline/tiles/BaseMessageTile.js b/src/domain/session/room/timeline/tiles/BaseMessageTile.js
index 1fadd855..65b50269 100644
--- a/src/domain/session/room/timeline/tiles/BaseMessageTile.js
+++ b/src/domain/session/room/timeline/tiles/BaseMessageTile.js
@@ -35,11 +35,11 @@ export class BaseMessageTile extends SimpleTile {
     }
 
     get permaLink() {
-        return `https://matrix.to/#/${this._room.id}/${this._entry.id}`;
+        return `https://matrix.to/#/${encodeURIComponent(this._room.id)}/${encodeURIComponent(this._entry.id)}`;
     }
 
     get senderProfileLink() {
-        return `https://matrix.to/#/${this.sender}`;
+        return `https://matrix.to/#/${encodeURIComponent(this.sender)}`;
     }
 
     get displayName() {