diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index a625dafaa9..1b47ea00cd 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -896,14 +896,16 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	// set font encoding
 	// this one is not per buffer
 	// for Farsi we also need to load the LAE and LFE encoding
-	if (lyxrc.fontenc != "default" && language->lang() == "farsi") {
-		os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
-		   << ",LFE,LAE]{fontenc}\n";
-		texrow.newline();
-	} else {
-		os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
-		   << "]{fontenc}\n";
-		texrow.newline();
+	if (lyxrc.fontenc != "default") {
+		if (language->lang() == "farsi") {
+			os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
+			   << ",LFE,LAE]{fontenc}\n";
+			texrow.newline();
+		} else {
+			os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
+			   << "]{fontenc}\n";
+			texrow.newline();
+		}
 	}
 
 	// handle inputenc etc.