diff --git a/src/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs b/src/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs
index ec14eb6b614..92162dd302a 100644
--- a/src/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs
+++ b/src/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs
@@ -197,7 +197,7 @@ public override void VisitSource(Source source)
 
 			// Replace tabs with spaces and remove C# comment escaping from callouts
 			// (elastic docs generation does not like this callout format)
-			source.Text = Regex.Replace(source.Text.Replace("\t", "    "), @"//[ \t]*\<(\d+)\>.*", "<$1>");
+			source.Text = Regex.Replace(source.Text.Replace("\t", "    "), @"//[ \t]*\<(\d+)\>[^\r\n]*", "<$1>");
 
 			base.VisitSource(source);
 		}
diff --git a/src/DocGenerator/Documentation/Blocks/CSharpBlock.cs b/src/DocGenerator/Documentation/Blocks/CSharpBlock.cs
index 2aefd6a1986..d588b2670b7 100644
--- a/src/DocGenerator/Documentation/Blocks/CSharpBlock.cs
+++ b/src/DocGenerator/Documentation/Blocks/CSharpBlock.cs
@@ -14,7 +14,7 @@ namespace DocGenerator.Documentation.Blocks
 	public class CSharpBlock : CodeBlock
 	{
 		private static readonly Regex Callout = new Regex(@"//[ \t]*(?<callout>\<\d+\>)[ \t]*(?<text>\S.*)", RegexOptions.Compiled);
-		private static readonly Regex CalloutReplacer = new Regex(@"//[ \t]*\<(\d+)\>.*", RegexOptions.Compiled);
+		private static readonly Regex CalloutReplacer = new Regex(@"//[ \t]*\<(\d+)\>[^\r\n]*", RegexOptions.Compiled);
 
 		public CSharpBlock(SyntaxNode node, int depth, string memberName = null)
 			: base(node.WithoutLeadingTrivia().ToFullStringWithoutPragmaWarningDirectiveTrivia(),