diff --git a/src/Link.js b/src/Link.js
index 9eb96ce..407c4ae 100644
--- a/src/Link.js
+++ b/src/Link.js
@@ -211,9 +211,9 @@ export class Link {
 
     toFragment() {
         if (this.eventId) {
-            return `/${this.identifier}/${this.eventId}`;
+            return `/${encodeURIComponent(this.identifier)}/${encodeURIComponent(this.eventId)}`;
         } else {
-            return `/${this.identifier}`;
+            return `/${encodeURIComponent(this.identifier)}`;
         }
     }
 }