diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Core/Configuration/ElasticsearchClientSettings.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Core/Configuration/ElasticsearchClientSettings.cs
index 5b92ec7379d..407b0a6c82f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Core/Configuration/ElasticsearchClientSettings.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Core/Configuration/ElasticsearchClientSettings.cs
@@ -321,6 +321,11 @@ public TConnectionSettings DefaultMappingFor(Type documentType,
 		if (!string.IsNullOrWhiteSpace(inferMapping._idProperty))
 			_idProperties[inferMapping._clrType] = inferMapping._idProperty;
 
+		if (inferMapping._disableIdInference)
+			_disableIdInference.Add(inferMapping._clrType);
+		else
+			_disableIdInference.Remove(inferMapping._clrType);
+
 		return (TConnectionSettings)this;
 	}
 
@@ -340,6 +345,14 @@ public TConnectionSettings DefaultMappingFor(IEnumerable<ClrTypeMapping> typeMap
 
 			if (!inferMapping.RelationName.IsNullOrEmpty())
 				_defaultRelationNames[inferMapping.ClrType] = inferMapping.RelationName;
+
+			if (!string.IsNullOrWhiteSpace(inferMapping.IdPropertyName))
+				_idProperties[inferMapping.ClrType] = inferMapping.IdPropertyName;
+
+			if (inferMapping.DisableIdInference)
+				_disableIdInference.Add(inferMapping.ClrType);
+			else
+				_disableIdInference.Remove(inferMapping.ClrType);
 		}
 
 		return (TConnectionSettings)this;