diff --git a/modules/markup/markdown/callout/github_legacy.go b/modules/markup/markdown/callout/github_legacy.go
index 32f33b02c7..39ea8619d8 100644
--- a/modules/markup/markdown/callout/github_legacy.go
+++ b/modules/markup/markdown/callout/github_legacy.go
@@ -65,6 +65,14 @@ func (g *GitHubLegacyCalloutTransformer) Transform(node *ast.Document, reader te
 			attentionParagraph.AppendChild(attentionParagraph, calloutNode)
 			firstParagraph.Parent().InsertBefore(firstParagraph.Parent(), firstParagraph, attentionParagraph)
 			firstParagraph.RemoveChild(firstParagraph, calloutNode)
+
+			// Remove softbreak line if there's one.
+			if firstParagraph.ChildCount() >= 1 {
+				softBreakNode, ok := firstParagraph.FirstChild().(*ast.Text)
+				if ok && softBreakNode.SoftLineBreak() {
+					firstParagraph.RemoveChild(firstParagraph, softBreakNode)
+				}
+			}
 		}
 
 		return ast.WalkContinue, nil
diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go
index 84a7c5f882..4c9ab42806 100644
--- a/modules/markup/markdown/markdown_test.go
+++ b/modules/markup/markdown/markdown_test.go
@@ -1356,4 +1356,10 @@ func TestCallout(t *testing.T) {
 	}
 
 	test(">\n0", "<blockquote>\n</blockquote>\n<p>0</p>")
+	test("> **Warning**\n> Bad stuff is brewing here", `<blockquote class="attention-header attention-warning"><p class="attention-title"><strong class="attention-warning">Warning</strong></p>
+<p>Bad stuff is brewing here</p>
+</blockquote>`)
+	test("> [!WARNING]\n> Bad stuff is brewing here", `<blockquote class="attention-header attention-warning"><p class="attention-title"><strong class="attention-warning">Warning</strong></p>
+<p>Bad stuff is brewing here</p>
+</blockquote>`)
 }