diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 89da6a611d..75420a46dc 100644
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -622,8 +622,7 @@ InsetQuotes::InsetQuotes(Buffer * buf, char_type c, InsetQuotesParams::QuoteLeve
 	bool dynamic = false;
 	if (buf) {
 		global_style_ = buf->masterBuffer()->params().quotes_style;
-		fontenc_ = (buf->masterBuffer()->params().fontenc == "global")
-			? lyxrc.fontenc : buf->params().fontenc;
+		fontenc_ = buf->masterBuffer()->params().font_encoding();
 		dynamic = buf->masterBuffer()->params().dynamic_quotes;
 		fontspec_ = buf->masterBuffer()->params().useNonTeXFonts;
 	} else {
@@ -974,7 +973,7 @@ void InsetQuotes::updateBuffer(ParIterator const & it, UpdateType /* utype*/)
 	BufferParams const & bp = buffer().masterBuffer()->params();
 	pass_thru_ = it.paragraph().isPassThru();
 	context_lang_ = it.paragraph().getFontSettings(bp, it.pos()).language()->code();
-	fontenc_ = (bp.fontenc == "global") ? lyxrc.fontenc : bp.fontenc;
+	fontenc_ = bp.font_encoding();
 	global_style_ = bp.quotes_style;
 	fontspec_ = bp.useNonTeXFonts;
 }