diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index c2c90558..d257929c 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -164,6 +164,7 @@ const playItem = (item) => {
   let baseDir = 'm3u8/';
 
   if (item.folder) {
+    item.folder = item.folder.split('/').map(encodeURIComponent).join('/');
     baseDir += item.folder + '/';
   }
 
diff --git a/frontend/src/main.js b/frontend/src/main.js
index bdde957e..6c71923c 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -25,6 +25,7 @@ app.config.globalProperties.makeDownload = (config, item, base = 'download') =>
   let baseDir = `${base}/`;
 
   if (item.folder) {
+    item.folder = item.folder.split('/').map(encodeURIComponent).join('/');
     baseDir += item.folder + '/';
   }