2 files changed, 4 insertions, 5 deletions
diff --git a/app/controllers/repositories/lfs_api_controller.rb b/app/controllers/repositories/lfs_api_controller.rb
index 32119ddf89e..da243a0301e 100644
--- a/app/controllers/repositories/lfs_api_controller.rb
+++ b/app/controllers/repositories/lfs_api_controller.rb
@@ -64,11 +64,13 @@ module Repositories
         .for_oids(objects_oids)
         .index_by(&:oid)
 
+      guest_can_download = Guest.can?(:download_code, project)
+
       objects.each do |object|
         if lfs_object = existing_oids[object[:oid]]
           object[:actions] = download_actions(object, lfs_object)
 
-          if Guest.can?(:download_code, project)
+          if guest_can_download
             object[:authenticated] = true
           end
         else
diff --git a/app/controllers/repositories/lfs_storage_controller.rb b/app/controllers/repositories/lfs_storage_controller.rb
index 22f1a81b95b..80f7153cd7a 100644
--- a/app/controllers/repositories/lfs_storage_controller.rb
+++ b/app/controllers/repositories/lfs_storage_controller.rb
@@ -18,10 +18,7 @@ module Repositories
 
     def download
       lfs_object = LfsObject.find_by_oid(oid)
-      unless lfs_object && lfs_object.file.exists?
-        render_lfs_not_found
-        return
-      end
+      return render_lfs_not_found unless lfs_object&.file&.exists?
 
       send_upload(lfs_object.file, send_params: { content_type: "application/octet-stream" })
     end