diff --git a/src/equicordplugins/dragify/index.tsx b/src/equicordplugins/dragify/index.tsx
index 1bb788f09..fa45ed4a2 100644
--- a/src/equicordplugins/dragify/index.tsx
+++ b/src/equicordplugins/dragify/index.tsx
@@ -216,7 +216,7 @@ export default definePlugin({
             find: ']="BADGES"',
             replacement: {
                 match: /(?="data-username-has-gradient")/,
-                replace: "draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].author),\"data-dragify-user\":!0,\"data-user-id\":arguments[0].author.id,"
+                replace: "draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].message?.author),\"data-dragify-user\":!0,\"data-user-id\":arguments[0].message?.author?.id,"
             }
         },
         // Call avatars (DM/group call tiles)
@@ -382,10 +382,10 @@ export default definePlugin({
         if (inspection.hasAttachment) return;
 
         const rawUserId =
-            inspection.authorId
-            ?? user?.id
+            user?.id
             ?? user?.userId
             ?? user?.user?.id
+            ?? inspection.authorId
             ?? inspection.userId
             ?? null;
         const userId = rawUserId?.trim();