diff --git a/js/models/messages.js b/js/models/messages.js
index 93436c048..feb92099a 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -604,7 +604,7 @@
 
       const selectedReaction = (
         (this.get('reactions') || []).find(
-          re => re.fromId === this.OUR_NUMBER
+          re => re.fromId === ConversationController.getOurConversationId()
         ) || {}
       ).emoji;