diff --git a/js/background.js b/js/background.js
index af3a6b40b7f..78122f24112 100644
--- a/js/background.js
+++ b/js/background.js
@@ -2086,7 +2086,7 @@
         targetAuthorUuid: reaction.targetAuthorUuid,
         targetTimestamp: reaction.targetTimestamp.toNumber(),
         timestamp: Date.now(),
-        fromId: messageDescriptor.id,
+        fromId: data.source,
       });
       // Note: We do not wait for completion here
       Whisper.Reactions.onReaction(reactionModel);
@@ -2214,6 +2214,7 @@
       event.confirm();
     } else if (data.message.reaction) {
       const { reaction } = data.message;
+      const ourNumber = textsecure.storage.user.getNumber();
       const reactionModel = Whisper.Reactions.add({
         emoji: reaction.emoji,
         remove: reaction.remove,
@@ -2221,7 +2222,7 @@
         targetAuthorUuid: reaction.targetAuthorUuid,
         targetTimestamp: reaction.targetTimestamp.toNumber(),
         timestamp: Date.now(),
-        fromId: messageDescriptor.id,
+        fromId: ourNumber,
       });
       // Note: We do not wait for completion here
       Whisper.Reactions.onReaction(reactionModel);