diff --git a/lib/models/note.js b/lib/models/note.js
index e199a3d..119d72c 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -117,11 +117,13 @@ module.exports = function (sequelize, DataTypes) {
       },
       encodeNoteId: function (id) {
         // remove dashes in UUID and encode in url-safe base64
-        return base64url.encode(id.replace(/-/g, ''))
+        let str = id.replace(/-/g, '')
+        let hexStr = Buffer.from(str, 'hex')
+        return base64url.encode(hexStr)
       },
       decodeNoteId: function (encodedId) {
         // decode from url-safe base64
-        let id = base64url.decode(encodedId)
+        let id = base64url.toBuffer(encodedId).toString('hex')
         // add dashes between the UUID string parts
         let idParts = []
         idParts.push(id.substr(0, 8))