diff --git a/pkg/query-service/app/logs/v3/enrich_query.go b/pkg/query-service/app/logs/v3/enrich_query.go
index 904b348999..06445d164d 100644
--- a/pkg/query-service/app/logs/v3/enrich_query.go
+++ b/pkg/query-service/app/logs/v3/enrich_query.go
@@ -153,9 +153,12 @@ func enrichFieldWithMetadata(field v3.AttributeKey, fields map[string]v3.Attribu
 		return field
 	}
 
-	// enrich with default values if metadata is not found
-	field.Type = v3.AttributeKeyTypeTag
-	field.DataType = v3.AttributeKeyDataTypeString
+	if field.Type == "" {
+		field.Type = v3.AttributeKeyTypeTag
+	}
+	if field.DataType == "" {
+		field.DataType = v3.AttributeKeyDataTypeString
+	}
 	return field
 }