diff --git a/kernel/model/import.go b/kernel/model/import.go
index c7096755292..ffa6e900824 100644
--- a/kernel/model/import.go
+++ b/kernel/model/import.go
@@ -1193,6 +1193,10 @@ func convertWikiLinksAndTags0(tree *parse.Tree) {
 }
 
 func convertTags(text string) (ret string) {
+	if !util.MarkdownSettings.InlineTag {
+		return text
+	}
+
 	pos, i := -1, 0
 	tokens := []byte(text)
 	for ; i < len(tokens); i++ {