diff --git a/module/applications/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs
index 53bf527b..e7290f1c 100644
--- a/module/applications/dialogs/tagTeamDialog.mjs
+++ b/module/applications/dialogs/tagTeamDialog.mjs
@@ -224,13 +224,11 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
                 speaker: cls.getSpeaker({ actor: this.party.find(x => x.id === mainRollId) }),
                 system: systemData,
                 rolls: mainRoll.rolls,
-                sound: null
+                sound: null,
+                flags: { core: { RollTable: true } }
             };
 
-        const prevHookStatus = game.dice3d.messageHookDisabled;
-        game.dice3d.messageHookDisabled = true;
         await cls.create(msgData);
-        game.dice3d.messageHookDisabled = prevHookStatus;
 
         const fearUpdate = { key: 'fear', value: null, total: null, enabled: true };
         for (let memberId of Object.keys(this.data.members)) {
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 3a5fef38..ec4c5a49 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -16,7 +16,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
         const html = await super.renderHTML({ actor: actorData, author: this.author });
 
         if (this.flags.core?.RollTable) {
-            html.querySelector('.roll-buttons.apply-buttons').remove();
+            html.querySelector('.roll-buttons.apply-buttons')?.remove();
         }
 
         this.enrichChatMessage(html);