diff --git a/module/documents/chat-message.mjs b/module/documents/chat-message.mjs
index 43a6a38..2de6c09 100644
--- a/module/documents/chat-message.mjs
+++ b/module/documents/chat-message.mjs
@@ -3,14 +3,18 @@ export default class HamalronChatMessage extends ChatMessage {
   prepareDerivedData() {
     if (this._source?.rolls) {
       for (const r of this._source.rolls) {
-        try {
-          Roll.parse(r.formula || "1d6")
-        } catch (e) {
+        if (r.formula && !/^[\ddDfFkKlLhH+\-*\/()%\s]+$/.test(r.formula)) {
           r.formula = "1d6"
         }
       }
     }
-    super.prepareDerivedData()
+    try {
+      super.prepareDerivedData()
+    } catch (e) {
+      console.warn("Hamalron | Failed to parse roll, resetting rolls")
+      if (this._source) this._source.rolls = []
+      super.prepareDerivedData()
+    }
   }
 
   async _renderRollContent(messageData) {