diff --git a/src/qortalRequests/get.ts b/src/qortalRequests/get.ts
index 034180a..9895f2a 100644
--- a/src/qortalRequests/get.ts
+++ b/src/qortalRequests/get.ts
@@ -1921,8 +1921,9 @@ export const joinGroup = async (data, isFromExtension) => {
 
 export const saveFile = async (data, sender, isFromExtension, snackMethods) => {
   try {
+    if (!data?.filename) throw new Error('Missing filename');
     if (data?.location) {
-      const requiredFieldsLocation = ['service', 'name', 'filename'];
+      const requiredFieldsLocation = ['service', 'name'];
       const missingFieldsLocation: string[] = [];
       requiredFieldsLocation.forEach((field) => {
         if (!data?.location[field]) {
@@ -1937,7 +1938,7 @@ export const saveFile = async (data, sender, isFromExtension, snackMethods) => {
       const resPermission = await getUserPermission(
         {
           text1: 'Would you like to download:',
-          highlightedText: `${data?.location?.filename}`,
+          highlightedText: `${data?.filename}`,
         },
         isFromExtension
       );
@@ -1949,11 +1950,10 @@ export const saveFile = async (data, sender, isFromExtension, snackMethods) => {
         locationUrl = locationUrl + `/${data.location.identifier}`;
       }
       const endpoint = await createEndpoint(
-        locationUrl +
-          `?attachment=true&attachmentFilename=${data?.location?.filename}`
+        locationUrl + `?attachment=true&attachmentFilename=${data?.filename}`
       );
       a.href = endpoint;
-      a.download = data.location.filename;
+      a.download = data.filename;
       document.body.appendChild(a);
       a.click();
       a.remove();