diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index f70bec6390..080b2078a7 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1365,7 +1365,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
         };
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
 
-        for ( ; *names; ++names )
+        for ( ; *names && ms_wcCharsetName.empty(); ++names )
         {
             const wxString nameCS(*names);