diff --git a/app/discussion/client/index.js b/app/discussion/client/index.js
index c209596ea44..25f06f1a7bb 100644
--- a/app/discussion/client/index.js
+++ b/app/discussion/client/index.js
@@ -3,5 +3,3 @@ import './lib/messageTypes/discussionMessage';
 import './createDiscussionMessageAction';
 import './discussionFromMessageBox';
 import './tabBar';
-
-import '../lib/discussionRoomType';
diff --git a/app/discussion/server/index.js b/app/discussion/server/index.js
index 92e47178450..4ae84cfb1c5 100644
--- a/app/discussion/server/index.js
+++ b/app/discussion/server/index.js
@@ -5,6 +5,3 @@ import './hooks/propagateDiscussionMetadata';
 
 // Methods
 import './methods/createDiscussion';
-
-// Lib
-import '../lib/discussionRoomType';
diff --git a/app/livechat/client/index.js b/app/livechat/client/index.js
index 2432ca73a6f..2ebfaed09b7 100644
--- a/app/livechat/client/index.js
+++ b/app/livechat/client/index.js
@@ -1,5 +1,4 @@
 import '../lib/messageTypes';
-import './roomType';
 import './route';
 import './ui';
 import './tabBar';
diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
index ec823937e7c..389ec96013a 100644
--- a/app/livechat/server/index.js
+++ b/app/livechat/server/index.js
@@ -4,7 +4,6 @@ import './startup';
 import './visitorStatus';
 import './agentStatus';
 import '../lib/messageTypes';
-import './roomType';
 import './hooks/beforeCloseRoom';
 import './hooks/beforeDelegateAgent';
 import './hooks/leadCapture';
diff --git a/app/tokenpass/client/index.js b/app/tokenpass/client/index.js
index ebf16d3e037..e51844feeee 100644
--- a/app/tokenpass/client/index.js
+++ b/app/tokenpass/client/index.js
@@ -1,6 +1,5 @@
 import '../lib/common';
 import './startup';
-import './roomType';
 import './tokenChannelsList.html';
 import './tokenChannelsList';
 import './tokenpassChannelSettings.html';
diff --git a/client/lib/rooms/roomTypes/direct.ts b/client/lib/rooms/roomTypes/direct.ts
index 0af415d4e8c..f3721d15ef3 100644
--- a/client/lib/rooms/roomTypes/direct.ts
+++ b/client/lib/rooms/roomTypes/direct.ts
@@ -104,9 +104,8 @@ roomCoordinator.add(DirectMessageRoomType, {
 		if (this.isGroupChat(room)) {
 			return getAvatarURL({
 				username: (room.uids || []).length + (room.usernames || []).join(),
-				roomId: undefined,
 				cache: room.avatarETag,
-			});
+			}) as string;
 		}
 
 		const sub = Subscriptions.findOne({ rid: room._id }, { fields: { name: 1 } });
@@ -142,10 +141,7 @@ roomCoordinator.add(DirectMessageRoomType, {
 
 		const query = {
 			t: 'd',
-			$or: [
-				{ name: identifier },
-				{ rid: identifier},
-			]
+			$or: [{ name: identifier }, { rid: identifier }],
 		};
 
 		const subscription = Subscriptions.findOne(query);
diff --git a/client/lib/rooms/roomTypes/private.ts b/client/lib/rooms/roomTypes/private.ts
index 30d8fd8e1bd..7ac60740abd 100644
--- a/client/lib/rooms/roomTypes/private.ts
+++ b/client/lib/rooms/roomTypes/private.ts
@@ -74,7 +74,7 @@ roomCoordinator.add(PrivateRoomType, {
 	},
 
 	getAvatarPath(room: Partial<IRoom> & { username?: IRoom['_id'] }): string {
-		return getAvatarURL({ roomId: room._id, cache: room.avatarETag, username: undefined });
+		return getAvatarURL({ roomId: room._id, cache: room.avatarETag }) as string;
 	},
 
 	getIcon(room: Partial<IRoom>): string | undefined {
diff --git a/client/lib/rooms/roomTypes/public.ts b/client/lib/rooms/roomTypes/public.ts
index f3d090ab96c..eb91264e784 100644
--- a/client/lib/rooms/roomTypes/public.ts
+++ b/client/lib/rooms/roomTypes/public.ts
@@ -73,7 +73,7 @@ roomCoordinator.add(PublicRoomType, {
 	},
 
 	getAvatarPath(room: Partial<IRoom> & { username?: IRoom['_id'] }): string {
-		return getAvatarURL({ roomId: room._id, cache: room.avatarETag, username: undefined });
+		return getAvatarURL({ roomId: room._id, cache: room.avatarETag }) as string;
 	},
 
 	getIcon(room: Partial<IRoom>): string | undefined {
diff --git a/client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx b/client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx
index f988cb759de..5fba8dedc58 100644
--- a/client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx
+++ b/client/views/teams/contextualBar/channels/AddExistingModal/RoomsInput.tsx
@@ -6,7 +6,7 @@ import { IRoom } from '../../../../../../definition/IRoom';
 import { Serialized } from '../../../../../../definition/Serialized';
 import RoomAvatar from '../../../../../components/avatar/RoomAvatar';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
-import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
+import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
 
 type RoomsInputProps = {
 	value: Serialized<IRoom>[];
@@ -34,7 +34,7 @@ const useRoomsAutoComplete = (
 		}
 
 		return data.items.map((room: Serialized<IRoom>) => ({
-			label: roomCoordinator.getRoomName(room.t, room),
+			label: roomCoordinator.getRoomName(room.t, room as unknown as IRoom),
 			value: room._id,
 		}));
 	}, [data]);