diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2d5455b67..da66f249b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2172,7 +2172,7 @@ module ApplicationHelper
         candown = User.current.member_of_org?(org) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
       elsif attachment.container.is_a?(OrgDocumentComment)
         org = attachment.container.organization
-        candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
+        candown = org.allow_guest_download || User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
       elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
           attachment.container.board.course
         course = attachment.container.board.course