diff --git a/lib/nokogiri/xml/node/save_options.rb b/lib/nokogiri/xml/node/save_options.rb
index 6da00134bb..8afeef345a 100644
--- a/lib/nokogiri/xml/node/save_options.rb
+++ b/lib/nokogiri/xml/node/save_options.rb
@@ -34,7 +34,7 @@ class SaveOptions
DEFAULT_HTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
end
# the default for XHTML document
- DEFAULT_XHTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_XHTML
+ DEFAULT_XHTML = FORMAT | NO_DECLARATION | AS_XHTML
# Integer representation of the SaveOptions
attr_reader :options
diff --git a/test/html4/test_document.rb b/test/html4/test_document.rb
index 29d87cf6d9..c6f0bfe862 100644
--- a/test/html4/test_document.rb
+++ b/test/html4/test_document.rb
@@ -370,6 +370,15 @@ def test_to_xhtml
assert_match("UTF-8", html.to_xhtml(encoding: "UTF-8"))
end
+ def test_to_xhtml_self_closing_tags
+ # https://github.com/sparklemotion/nokogiri/issues/2324
+ html = "
"
+ doc = Nokogiri::HTML::Document.parse(html)
+ xhtml = doc.to_xhtml
+ assert_match(%r(
), xhtml)
+ assert_match(%r(), xhtml)
+ end
+
def test_no_xml_header
html = Nokogiri::HTML(<<~EOHTML)