diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
index 5749c5f66e..036ebd7de1 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
@@ -9,6 +9,7 @@
     "Reply": "Reply",
     "Update": "Update",
     "Edit": "Edit",
-    "MessageDeletionConfirmationMessage": "This comment will be deleted completely."
+    "MessageDeletionConfirmationMessage": "This comment will be deleted completely.",
+    "CommentAuthorizationExceptionMessage": "Those comments are not allowed for public display."
   }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitOptions.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitOptions.cs
index cc69f715ce..8e13acca5c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitOptions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitOptions.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 using Volo.CmsKit.Reactions;
 
 namespace Volo.CmsKit
@@ -8,9 +9,13 @@ namespace Volo.CmsKit
         [NotNull]
         public ReactionDefinitionDictionary Reactions { get; }
 
+        [NotNull]
+        public List<string> PublicCommentEntities { get; }
+
         public CmsKitOptions()
         {
             Reactions = new ReactionDefinitionDictionary();
+            PublicCommentEntities = new List<string>();
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Comments/CommentPublicAppService.cs
index 06991e6a42..5edd0303d1 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Comments/CommentPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Comments/CommentPublicAppService.cs
@@ -3,27 +3,35 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Options;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Volo.Abp.Authorization;
 using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.Comments
 {
-    [Authorize]
     public class CommentPublicAppService : ApplicationService, ICommentPublicAppService
     {
+        private readonly CmsKitOptions _cmsKitOptions;
         protected ICommentRepository CommentRepository { get; }
         public ICmsUserLookupService CmsUserLookupService { get; }
 
-        public CommentPublicAppService(ICommentRepository commentRepository, ICmsUserLookupService cmsUserLookupService)
+        public CommentPublicAppService(
+            ICommentRepository commentRepository,
+            ICmsUserLookupService cmsUserLookupService,
+            IOptionsSnapshot<CmsKitOptions> cmsKitOptions)
         {
+            _cmsKitOptions = cmsKitOptions.Value;
             CommentRepository = commentRepository;
             CmsUserLookupService = cmsUserLookupService;
         }
 
         public async Task<ListResultDto<CommentWithDetailsDto>> GetAllForEntityAsync(string entityType, string entityId)
         {
+            CheckAuthorizationAsync(entityType);
+
             var commentsWithAuthor = await CommentRepository.GetListAsync(entityType, entityId);
 
             return new ListResultDto<CommentWithDetailsDto>(
@@ -31,6 +39,7 @@ namespace Volo.CmsKit.Comments
                 );
         }
 
+        [Authorize]
         public async Task<CommentDto> CreateAsync(CreateCommentInput input)
         {
             var user = await CmsUserLookupService.FindByIdAsync(CurrentUser.Id.Value);
@@ -52,6 +61,7 @@ namespace Volo.CmsKit.Comments
             return ObjectMapper.Map<Comment, CommentDto>(comment);
         }
 
+        [Authorize]
         public async Task<CommentDto> UpdateAsync(Guid id, UpdateCommentInput input)
         {
             var comment = await CommentRepository.GetAsync(id);
@@ -68,6 +78,7 @@ namespace Volo.CmsKit.Comments
             return ObjectMapper.Map<Comment, CommentDto>(updatedComment);
         }
 
+        [Authorize]
         public async Task DeleteAsync(Guid id)
         {
             var comment = await CommentRepository.GetAsync(id);
@@ -105,6 +116,24 @@ namespace Volo.CmsKit.Comments
             return parentComments;
         }
 
+        private async Task CheckAuthorizationAsync(string entityType)
+        {
+            if (await IsPublicEntity(entityType))
+            {
+                return;
+            }
+
+            if (!CurrentUser.IsAuthenticated)
+            {
+                throw new AbpAuthorizationException(L["CommentAuthorizationExceptionMessage"]);
+            }
+        }
+
+        private async Task<bool> IsPublicEntity(string entityType)
+        {
+            return _cmsKitOptions.PublicCommentEntities.Contains(entityType);
+        }
+
         private CmsUserDto GetAuthorAsDtoFromCommentList(List<CommentWithAuthor> comments, Guid commentId)
         {
             return ObjectMapper.Map<CmsUser, CmsUserDto>(comments.Single(c => c.Comment.Id == commentId).Author);