diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
index c4dc313eb..25a082946 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
@@ -158,8 +158,10 @@ public class PostController extends BaseController{
             post.setUser(user);
             List<Category> categories = categoryService.strListToCateList(cateList);
             post.setCategories(categories);
-            List<Tag> tags = tagService.strListToTagList(StringUtils.trim(tagList));
-            post.setTags(tags);
+            if(StringUtils.isNotEmpty(tagList)){
+                List<Tag> tags = tagService.strListToTagList(StringUtils.trim(tagList));
+                post.setTags(tags);
+            }
             postService.saveByPost(post);
             log.info("已发表新文章："+post.getPostTitle());
             logsService.saveByLogs(new Logs(LogsRecord.PUSH_POST,post.getPostTitle(),HaloUtil.getIpAddr(request),HaloUtil.getDate()));
diff --git a/src/main/resources/templates/admin/admin_md-editor.ftl b/src/main/resources/templates/admin/admin_md-editor.ftl
index 6e0b4e4d0..43573ee3a 100644
--- a/src/main/resources/templates/admin/admin_md-editor.ftl
+++ b/src/main/resources/templates/admin/admin_md-editor.ftl
@@ -151,7 +151,8 @@
             $('#tagList').tagEditor({
                 //initialTags: ['Hello', 'World', 'Example', 'Tags'],
                 delimiter: ',',
-                placeholder: '请输入标签'
+                placeholder: '请输入标签',
+                forceLowercase: false
             });
 
             <#if post??>