diff --git a/module/deltagreen.js b/module/deltagreen.js
index 62a6c30..0734e31 100644
--- a/module/deltagreen.js
+++ b/module/deltagreen.js
@@ -205,8 +205,9 @@ Hooks.on("renderChatLog", async (app, element, context, options) => {
     const btnWithAction = DGUtils.htmlClosest(event.target, "button[data-action]");
     const message = DGUtils.htmlClosest(event.target, "li[data-message-id]");
 
-    if (btnWithAction && message && message?.dataset?.messageId) {
-      handleInlineActions(btnWithAction, message?.dataset?.messageId);
+    const { messageId } = message?.dataset || {}
+    if (btnWithAction && messageId) {
+      handleInlineActions(btnWithAction, messageId);
     }
   });
 });
\ No newline at end of file