diff --git a/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php b/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
index dd929a511..645f2387f 100644
--- a/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
+++ b/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
@@ -78,7 +78,11 @@ class StyleMerger
 
     protected function mergeBorderStyle(Border $baseBorderStyle, Border $borderStyle): void
     {
-        $baseBorderStyle->setBorderStyle($borderStyle->getBorderStyle());
+        if ($borderStyle->getBorderStyle() !== Border::BORDER_OMIT) {
+            $baseBorderStyle->setBorderStyle(
+                $borderStyle->getBorderStyle()
+            );
+        }
         if ($borderStyle->getColor()->getARGB() !== null) {
             $baseBorderStyle->setColor($borderStyle->getColor());
         }
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 3a9f3a2cb..e1ed1faaf 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -1658,7 +1658,9 @@ class Html extends BaseWriter
                     $holdCss = '';
                 }
                 foreach ($styles as $key => $value) {
-                    $html .= $key . ':' . $value . ';';
+                    if (!str_starts_with($key, 'border-') || $value !== 'none #000000') {
+                        $html .= $key . ':' . $value . ';';
+                    }
                 }
                 $html .= '"';
             }