diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index af3d8f7ff9..56261546e7 100644
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -166,7 +166,8 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
 
         CloseLists(-1, str);
 
-        str << wxT("</font>");
+        if (currentParaStyle.HasFont())
+            str << wxT("</font>");
 
         if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
             str << wxT("</body></html>");