diff --git a/src/config/configSchema.json b/src/config/configSchema.json
index 4af39058..a2afde1e 100644
--- a/src/config/configSchema.json
+++ b/src/config/configSchema.json
@@ -139,6 +139,10 @@
       "type": "boolean",
       "default": false
     },
+    "download": {
+      "type": "boolean",
+      "default": false
+    },
     "seekThumbnails": {
       "type": "boolean",
       "default": true
diff --git a/src/plugins/share/share.js b/src/plugins/share/share.js
index 9f0cdc9f..35483f6f 100644
--- a/src/plugins/share/share.js
+++ b/src/plugins/share/share.js
@@ -54,13 +54,15 @@ const SharePlugin = function (options = {}, playerInstance) {
 
     const transformations = stripKeysDeep(player.cloudinary.transformation() || {});
 
+    const filename = player.cloudinary.currentPublicId()?.split('/')?.pop();
+
     const baseOptions = {
       ...player.cloudinary.cloudinaryConfig(),
       ...transformations,
       resource_type: 'video',
       format: 'mp4',
       video_codec: 'h264',
-      flags: `streaming_attachment:${player.cloudinary.currentPublicId()}`,
+      flags: `streaming_attachment:${filename}`,
     };
 
     // For ABR - download a limited-size video
@@ -114,9 +116,6 @@ const SharePlugin = function (options = {}, playerInstance) {
       const response = await fetch(url, { method: 'HEAD' });
 
       if (RETRY_STATUS_CODES.includes(response.status) && attempt < MAX_ATTEMPTS) {
-        if (attempt === 0) {
-          setPreparingState(true);
-        }
         await wait(INTERVAL_MS);
         return fetchDownload(attempt + 1);
       }
@@ -125,6 +124,7 @@ const SharePlugin = function (options = {}, playerInstance) {
       triggerDownload();
     };
 
+    setPreparingState(true);
     fetchDownload();
   };