diff --git a/js/models/messages.js b/js/models/messages.js
index 306b8930de..2010e6a7e5 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -2182,10 +2182,7 @@
                   attributes.left = false;
                 }
               } else if (dataMessage.group.type === GROUP_TYPES.QUIT) {
-                if (
-                  source === textsecure.storage.user.getNumber() ||
-                  sourceUuid === textsecure.storage.user.getUuid()
-                ) {
+                if (ConversationController.get(source || sourceUuid).isMe()) {
                   attributes.left = true;
                   groupUpdate = { left: 'You' };
                 } else {
@@ -2196,8 +2193,7 @@
                 }
                 attributes.members = _.without(
                   conversation.get('members'),
-                  source,
-                  sourceUuid
+                  ConversationController.get(source || sourceUuid).get('id')
                 );
               }