diff --git a/components/Modals/CreateRoom.tsx b/components/Modals/CreateRoom.tsx
index 2c590a2..af749cf 100644
--- a/components/Modals/CreateRoom.tsx
+++ b/components/Modals/CreateRoom.tsx
@@ -4,12 +4,14 @@ import {
   ShowModalType,
   useKeyboardContext,
 } from "../../contexts/keyboardContext";
+import { useTeamDashboardContext } from "../../contexts/teamDashboardContext";
 
 const { Option } = Select;
 
 const thisModalType = ShowModalType.createRoom;
 
 export default function CreateRoomModal() {
+  const { teamUsers } = useTeamDashboardContext();
   const { pastedLink, handleModalType, showModalType } = useKeyboardContext();
 
   useEffect(() => {
diff --git a/contexts/teamDashboardContext.tsx b/contexts/teamDashboardContext.tsx
index 72e92e4..1ac5597 100644
--- a/contexts/teamDashboardContext.tsx
+++ b/contexts/teamDashboardContext.tsx
@@ -303,8 +303,8 @@ export function TeamDashboardContextProvider({ children }) {
     ...value,
     allMessages,
     messagesByTeamMate,
-    ...teamUsers,
-    ...teamUsersMap,
+    teamUsers,
+    teamUsersMap,
   };
 
   return (