diff --git a/flexmark/src/main/java/com/vladsch/flexmark/html/renderer/CoreNodeRenderer.java b/flexmark/src/main/java/com/vladsch/flexmark/html/renderer/CoreNodeRenderer.java
index 813a8080b..630a36817 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/html/renderer/CoreNodeRenderer.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/html/renderer/CoreNodeRenderer.java
@@ -139,7 +139,7 @@ void render(BlockQuote node, NodeRendererContext context, HtmlWriter html) {
     }
 
     void render(FencedCodeBlock node, NodeRendererContext context, HtmlWriter html) {
-        html.line();
+        html.lineIf(context.getHtmlOptions().htmlBlockOpenTagEol);
         html.srcPosWithTrailingEOL(node.getChars()).withAttr().tag("pre").openPre();
 
         BasedSequence info = node.getInfo();
@@ -172,7 +172,7 @@ void render(ThematicBreak node, NodeRendererContext context, HtmlWriter html) {
     }
 
     void render(IndentedCodeBlock node, NodeRendererContext context, HtmlWriter html) {
-        html.line();
+        html.lineIf(context.getHtmlOptions().htmlBlockOpenTagEol);
         html.srcPosWithEOL(node.getChars()).withAttr().tag("pre").openPre();
 
         String noLanguageClass = context.getHtmlOptions().noLanguageClass.trim();
@@ -459,8 +459,8 @@ void render(Code node, NodeRendererContext context, HtmlWriter html) {
 
     @SuppressWarnings("MethodMayBeStatic")
     void render(HtmlBlock node, NodeRendererContext context, HtmlWriter html) {
-        html.line();
         HtmlRendererOptions htmlOptions = context.getHtmlOptions();
+        html.lineIf(htmlOptions.htmlBlockOpenTagEol);
 
         if (htmlOptions.sourceWrapHtmlBlocks) {
             html.srcPos(node.getChars()).withAttr(AttributablePart.NODE_POSITION).tag("div").indent().line();
@@ -499,7 +499,7 @@ public static void renderHtmlBlock(HtmlBlockBase node, NodeRendererContext conte
         if (suppress) return;
 
         if (node instanceof HtmlBlock)
-            html.line();
+            html.lineIf(context.getHtmlOptions().htmlBlockOpenTagEol);
 
         String normalizeEOL = node instanceof HtmlBlock ? node.getContentChars().normalizeEOL() : node.getChars().normalizeEOL();