diff --git a/app/Http/Controllers/ProtectedDownloadController.php b/app/Http/Controllers/ProtectedDownloadController.php
index c4c38761b9ab..d7277d69f383 100644
--- a/app/Http/Controllers/ProtectedDownloadController.php
+++ b/app/Http/Controllers/ProtectedDownloadController.php
@@ -30,12 +30,7 @@ class ProtectedDownloadController extends BaseController
             abort(404, 'File no longer available');
         }
 
-        UnlinkFile::dispatch(config('filesystems.default'), $hashed_path)->delay(now()->addSeconds(10));
-
-        return response()->streamDownload(function () use ($hashed_path) {
-            echo Storage::get($hashed_path);
-        }, basename($hashed_path), []);
-        
+        return response()->download($hashed_path, basename($hashed_path), [])->deleteFileAfterSend(true);
 
     }
 
diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index ef38615696fc..6efc82126297 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -126,7 +126,7 @@ class Helpers
             return $custom_field_parts[0];
         }
 
-        $field = str_replace(["quote","credit"], ["invoice","invoice"], $field);
+        $field = str_replace(["quote","credit"], ["invoice", "invoice"], $field);
 
         if ($custom_fields && property_exists($custom_fields, $field)) {
             $custom_field = $custom_fields->{$field};