diff --git a/src/events/cursor.ts b/src/events/cursor.ts
index a1c1ba9..13bf23c 100644
--- a/src/events/cursor.ts
+++ b/src/events/cursor.ts
@@ -89,7 +89,7 @@ export async function initCursorTracking() {
     >(AppEvents.FriendDisconnected, (event) => {
       const payload = parseEventPayload<
         [{ userId: string }] | { userId: string }
-      >(event.payload, "friend-disconnected");
+      >(event.payload, AppEvents.FriendDisconnected);
       if (!payload) return;
 
       const data = Array.isArray(payload) ? payload[0] : payload;
@@ -117,7 +117,7 @@ export async function initCursorTracking() {
       const data = parseEventPayload<{
         friendId: string;
         doll: DollDto | null;
-      }>(event.payload, "friend-active-doll-changed");
+      }>(event.payload, AppEvents.FriendActiveDollChanged);
       if (!data) return;
 
       // Cast to expected type after parsing
diff --git a/src/events/user-status.ts b/src/events/user-status.ts
index ca3f049..42cd622 100644
--- a/src/events/user-status.ts
+++ b/src/events/user-status.ts
@@ -28,7 +28,7 @@ export async function initUserStatusListeners() {
         const payload = parseEventPayload<{
           userId?: string;
           status?: UserStatus;
-        }>(event.payload, "friend-user-status");
+        }>(event.payload, AppEvents.FriendUserStatus);
         if (!payload) return;
 
         const userId = payload.userId;
@@ -63,7 +63,7 @@ export async function initUserStatusListeners() {
     >(AppEvents.FriendDisconnected, (event) => {
       const payload = parseEventPayload<
         [{ userId: string }] | { userId: string }
-      >(event.payload, "friend-disconnected");
+      >(event.payload, AppEvents.FriendDisconnected);
       if (!payload) return;
 
       const data = Array.isArray(payload) ? payload[0] : payload;