diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index d78f29d0d8..6df2416ac4 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -2105,7 +2105,7 @@ void InsetMathHull::mathAsLatex(WriteStream & os) const
 docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
 {
 	BufferParams::MathOutput const mathtype = 
-		buffer().params().html_math_output;
+		buffer().masterBuffer()->params().html_math_output;
 
 	bool success = false;
 
diff --git a/status.20x b/status.20x
index 72b7835f43..9050bc6106 100644
--- a/status.20x
+++ b/status.20x
@@ -34,6 +34,8 @@ What's new
 
 - Added CSS styling for Memoir's epigraphs (bug 8611).
 
+- Use master document's setting for all HTML math output (bug 8607).
+
 
 * TEX2LYX IMPROVEMENTS