diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
index b64a89645..e92c5153f 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
@@ -36,8 +36,7 @@ public class FileBasedOpenPgpStore extends AbstractOpenPgpStore {
     }
 
     public static File getContactsPath(File basePath, BareJid jid) {
-        // TODO: This is not filesystem agnostic, the jid should be base32 encoded.
-        return new File(basePath, Objects.requireNonNull(jid.toString()));
+        return new File(basePath, Objects.requireNonNull(jid.asUrlEncodedString()));
     }
 
 }