diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
index 14d96403..8741f351 100644
--- a/XmlSchemaClassGenerator/TypeModel.cs
+++ b/XmlSchemaClassGenerator/TypeModel.cs
@@ -70,7 +70,7 @@ public static IEnumerable<CodeCommentStatement> GetComments(IList<DocumentationM
             yield return new CodeCommentStatement("<summary>", true);
 
             foreach (var doc in docs
-                .Where(d => conf.CommentLanguages.Any(l => d.Language.StartsWith(l, StringComparison.OrdinalIgnoreCase)))
+                .Where(d => string.IsNullOrEmpty(d.Language) || conf.CommentLanguages.Any(l => d.Language.StartsWith(l, StringComparison.OrdinalIgnoreCase)))
                 .OrderBy(d => d.Language))
             {
                 var text = doc.Text;
@@ -86,7 +86,7 @@ public static void AddDescription(CodeAttributeDeclarationCollection attributes,
         {
             if (!conf.GenerateDescriptionAttribute || DisableComments || !docs.Any()) return;
 
-            var doc = GetSingleDoc(docs.Where(d => conf.CommentLanguages.Any(l => d.Language.StartsWith(l, StringComparison.OrdinalIgnoreCase))));
+            var doc = GetSingleDoc(docs.Where(d => string.IsNullOrEmpty(d.Language) || conf.CommentLanguages.Any(l => d.Language.StartsWith(l, StringComparison.OrdinalIgnoreCase))));
 
             if (doc != null)
             {