diff --git a/module/actor.js b/module/actor.js
index 76b83c77..12ffc4f1 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -232,9 +232,6 @@ export class RdDActor extends Actor {
     }
     ChatMessage.create(chatOptions);
 
-    if ( !rollData.attackerRoll) // Store it again the registry if not a defense roll
-      game.system.rdd.rollDataHandler[this.data._id] = rollData; 
-
     // This an attack, generate the defense message
     if (defenseMsg) {
       defenseMsg.rollData = duplicate(rollData);
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index d430f3c6..6adb1d16 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -468,6 +468,7 @@ export class RdDUtility  {
                        content: "<strong>"+myTarget.name+"</strong> doit se défendre : <br><span class='chat-card-button-area'>" +
                                 "<a class='chat-card-button' id='encaisser-button' data-attackerid='"+attacker.data._id + "' data-defenderid='" + myTarget.data._id + "'>Encaisser !</a></span>",                                                         
                        whisper: ChatMessage.getWhisperRecipients( myTarget.name ),
+                       attackerid: attacker.data._id,
                        defenderid: myTarget.data._id,
                        rollMode: true
                       };
diff --git a/system.json b/system.json
index 3a0fe650..044fb1d5 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "0.9.53",
+  "version": "0.9.54",
   "minimumCoreVersion": "0.7.5",
   "compatibleCoreVersion": "0.7.6",
   "templateVersion": 46,