diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
index b8e23f6e44d36..1b876fc99b2d8 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
+++ b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
@@ -38,9 +38,9 @@ const UserAutoComplete = ({ value, ...props }: UserAutoCompleteProps): ReactElem
 			onChange={props.onChange as any}
 			filter={filter}
 			setFilter={setFilter}
-			renderSelected={({ value, label }): ReactElement => {
+			renderSelected={({ value, label }): ReactElement | null => {
 				if (!value) {
-					undefined;
+					return null;
 				}
 
 				return (
diff --git a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
index b27c6d6034f9d..9efda652b61a1 100644
--- a/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
+++ b/apps/meteor/client/components/UserAutoCompleteMultiple/UserAutoCompleteMultiple.tsx
@@ -1,4 +1,4 @@
-import { AutoComplete, Box, Option, Chip } from '@rocket.chat/fuselage';
+import { AutoComplete, Box, Option, OptionAvatar, OptionContent, Chip } from '@rocket.chat/fuselage';
 import { useMutableCallback, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import React, { ComponentProps, memo, ReactElement, useMemo, useState } from 'react';
 
@@ -52,12 +52,12 @@ const UserAutoCompleteMultiple = ({ onChange, ...props }: UserAutoCompleteMultip
 			}
 			renderItem={({ value, label, ...props }): ReactElement => (
 				<Option key={value} {...props}>
-					<Option.Avatar>
+					<OptionAvatar>
 						<UserAvatar username={value} size='x20' />
-					</Option.Avatar>
-					<Option.Content>
+					</OptionAvatar>
+					<OptionContent>
 						{label} <Option.Description>({value})</Option.Description>
-					</Option.Content>
+					</OptionContent>
 				</Option>
 			)}
 			options={options}
diff --git a/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx b/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
index 467f6c23be36b..eeb1c46f34cb2 100644
--- a/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannelWithData.tsx
@@ -41,7 +41,7 @@ const CreateChannelWithData = ({ onClose, teamId = '', reload }: CreateChannelWi
 	}, [canCreateChannel, canCreatePrivateChannel]);
 
 	const initialValues = {
-		users: [''],
+		users: [],
 		name: '',
 		description: '',
 		type: canOnlyCreateOneType ? canOnlyCreateOneType === 'p' : true,