diff --git a/src/routes/api/clipper.js b/src/routes/api/clipper.js
index 9a39ca797..15b8dc76d 100644
--- a/src/routes/api/clipper.js
+++ b/src/routes/api/clipper.js
@@ -154,9 +154,8 @@ function processContent(images, note, content) {
 
             const attachment = imageService.saveImageToAttachment(note.noteId, buffer, filename, true);
 
-            // We might want to replace with escape-html. For non-latin-based languages, this doesn't work well.
-            const sanitizedTitle = attachment.title.replace(/[^a-z0-9-.]/gi, "") || "attachment";
-            const url = `api/attachments/${attachment.attachmentId}/image/${sanitizedTitle}`;
+            const encodedTitle = encodeURIComponent(attachment.title);
+            const url = `api/attachments/${attachment.attachmentId}/image/${encodedTitle}`;
 
             log.info(`Replacing '${imageId}' with '${url}' in note '${note.noteId}'`);
 
diff --git a/src/services/import/enex.js b/src/services/import/enex.js
index ec2a36c53..2ae57c806 100644
--- a/src/services/import/enex.js
+++ b/src/services/import/enex.js
@@ -303,9 +303,8 @@ function importEnex(taskContext, file, parentNote) {
 
                     const attachment = imageService.saveImageToAttachment(noteEntity.noteId, resource.content, originalName, taskContext.data.shrinkImages);
 
-                    // We might want to replace with escape-html. For non-latin-based languages, this doesn't work well.
-                    const sanitizedTitle = attachment.title.replace(/[^a-z0-9-.]/gi, "") || "attachment";
-                    const url = `api/attachments/${attachment.attachmentId}/image/${sanitizedTitle}`;
+                    const encodedTitle = encodeURIComponent(attachment.title);
+                    const url = `api/attachments/${attachment.attachmentId}/image/${encodedTitle}`;
                     const imageLink = `<img src="${url}">`;
 
                     content = content.replace(mediaRegex, imageLink);
diff --git a/src/services/notes.js b/src/services/notes.js
index e9c7e1b76..c325bba9b 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -529,10 +529,9 @@ function downloadImages(noteId, content) {
             const imageService = require('../services/image');
             const attachment = imageService.saveImageToAttachment(noteId, imageBuffer, "inline image", true, true);
 
-            // We might want to replace with escape-html. For non-latin-based languages, this doesn't work well.
-            const sanitizedTitle = attachment.title.replace(/[^a-z0-9-.]/gi, "") || "attachment";
+            const encodedTitle = encodeURIComponent(attachment.title);
 
-            content = `${content.substr(0, imageMatch.index)}<img src="api/attachments/${attachment.attachmentId}/image/${sanitizedTitle}"${content.substr(imageMatch.index + imageMatch[0].length)}`;
+            content = `${content.substr(0, imageMatch.index)}<img src="api/attachments/${attachment.attachmentId}/image/${encodedTitle}"${content.substr(imageMatch.index + imageMatch[0].length)}`;
         }
         else if (!url.includes('api/images/') && !/api\/attachments\/.+\/image\/?.*/.test(url)
             // this is an exception for the web clipper's "imageId"