diff --git a/src/component/main.vue b/src/component/main.vue
index 5a0bc074..73d2368e 100644
--- a/src/component/main.vue
+++ b/src/component/main.vue
@@ -114,7 +114,7 @@
         can_control: false,
         clipboard_access: false,
       },
-      members: [],
+      members: {},
     } as NekoState
 
     public get connected() {
diff --git a/src/component/types/messages.ts b/src/component/types/messages.ts
index 3c60cca8..b766986f 100644
--- a/src/component/types/messages.ts
+++ b/src/component/types/messages.ts
@@ -12,7 +12,7 @@ export interface SystemInit {
   member_id: string
   control_host: ControlHost
   screen_size: ScreenSize
-  members: MemberData[]
+  members: Record<string, MemberData>
 }
 
 export interface SystemAdmin {
@@ -21,7 +21,6 @@ export interface SystemAdmin {
   broadcast_status: BroadcastStatus
 }
 
-// TODO: New.
 export interface SystemDisconnect {
   event: string | undefined
   message: string
diff --git a/src/component/types/state.ts b/src/component/types/state.ts
index db2fa7d9..e88f0e32 100644
--- a/src/component/types/state.ts
+++ b/src/component/types/state.ts
@@ -4,7 +4,7 @@ export default interface State {
   control: Control
   screen: Screen
   member: Member
-  members: Member[]
+  members: Record<string, Member>
 }
 
 /////////////////////////////