diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagCreateDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagCreateDto.cs
new file mode 100644
index 0000000000..92e83fecf4
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagCreateDto.cs
@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    public class EntityTagCreateDto
+    {
+        [Required]
+        public string TagName { get; set; }
+
+        [Required]
+        public string EntityType { get; set; }
+
+        [Required]
+        public string EntityId { get; set; }
+    }
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagRemoveDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagRemoveDto.cs
new file mode 100644
index 0000000000..411d4c7157
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/EntityTagRemoveDto.cs
@@ -0,0 +1,17 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    public class EntityTagRemoveDto
+    {
+        [Required]
+        public Guid TagId { get; set; }
+
+        [Required]
+        public string EntityType { get; set; }
+
+        [Required]
+        public string EntityId { get; set; }
+    }
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/IEntityTagAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/IEntityTagAdminAppService.cs
new file mode 100644
index 0000000000..aece4d5c00
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/IEntityTagAdminAppService.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    public interface IEntityTagAdminAppService
+    {
+        Task AddTagToEntityAsync(EntityTagCreateDto input);
+
+        Task RemoveTagFromEntityAsync(EntityTagRemoveDto input);
+    }
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs
index 6778dd7916..3934f8a6b2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs
@@ -21,7 +21,6 @@ namespace Volo.CmsKit.Admin.Pages
         public virtual async Task<PageDto> GetAsync(Guid id)
         {
             var page = await PageRepository.GetAsync(id);
-
             return ObjectMapper.Map<Page, PageDto>(page);
         }
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/EntityTagAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/EntityTagAdminAppService.cs
new file mode 100644
index 0000000000..848a2ea11e
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/EntityTagAdminAppService.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Threading.Tasks;
+using Volo.CmsKit.Admin.Tags;
+using Volo.CmsKit.Tags;
+
+namespace Volo.CmsKit.Admin.Application.Volo.CmsKit.Admin.Tags
+{
+    public class EntityTagAdminAppService : CmsKitAdminAppServiceBase, IEntityTagAdminAppService
+    {
+        protected ITagDefinitionStore _tagDefinitionStore;
+        protected IEntityTagManager _entityTagManager;
+        protected ITagManager _tagManager;
+
+        public EntityTagAdminAppService(
+            ITagDefinitionStore tagDefinitionStore,
+            IEntityTagManager entityTagManager,
+            ITagManager tagManager)
+        {
+            _tagDefinitionStore = tagDefinitionStore;
+            _entityTagManager = entityTagManager;
+            _tagManager = tagManager;
+        }
+
+        public async Task AddTagToEntityAsync(EntityTagCreateDto input)
+        {
+            var definition = await _tagDefinitionStore.GetTagDefinitionAsync(input.EntityType);
+
+            await CheckPolicyAsync(definition.CreatePolicy);
+
+            var tag = await _tagManager.GetOrAddAsync(input.EntityType, input.TagName, CurrentTenant?.Id);
+
+            await _entityTagManager.AddTagToEntityAsync(
+                tag.Id,
+                input.EntityType,
+                input.EntityId,
+                CurrentTenant?.Id);
+        }
+
+        public async Task RemoveTagFromEntityAsync(EntityTagRemoveDto input)
+        {
+            var definition = await _tagDefinitionStore.GetTagDefinitionAsync(input.EntityType);
+
+            await CheckPolicyAsync(definition.DeletePolicy);
+
+            await _entityTagManager.RemoveTagFromEntityAsync(
+                input.TagId,
+                input.EntityType,
+                input.EntityId,
+                CurrentTenant?.Id);
+        }
+    }
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/DefaultTagDefinitionStore.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/DefaultTagDefinitionStore.cs
index bf52474446..b080720129 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/DefaultTagDefinitionStore.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/DefaultTagDefinitionStore.cs
@@ -17,10 +17,13 @@ namespace Volo.CmsKit.Tags
             this.options = options.Value;
         }
 
-        public virtual Task<TagDefiniton> GetTagDefinitionOrNullAsync([NotNull] string entityType)
+        public virtual Task<TagDefiniton> GetTagDefinitionAsync([NotNull] string entityType)
         {
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
-            return Task.FromResult(options.Tags.GetOrDefault(entityType));
+
+            var result = options.Tags.GetOrDefault(entityType) ?? throw new EntityNotTaggableException(entityType);
+
+            return Task.FromResult(result);
         }
 
         public virtual Task<List<TagDefiniton>> GetTagDefinitionsAsync()
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagDefinitionStore.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagDefinitionStore.cs
index 033c6e6a5f..c2e12eb16b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagDefinitionStore.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagDefinitionStore.cs
@@ -8,7 +8,7 @@ namespace Volo.CmsKit.Tags
     {
         Task<List<TagDefiniton>> GetTagDefinitionsAsync();
 
-        Task<TagDefiniton> GetTagDefinitionOrNullAsync([NotNull] string entityType);
+        Task<TagDefiniton> GetTagDefinitionAsync([NotNull] string entityType);
 
         Task<bool> IsDefinedAsync([NotNull] string entityType);
     }