diff --git a/js/models/messages.js b/js/models/messages.js
index f7867220e..1c97785f4 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -133,7 +133,8 @@
                 var conversationId = source;
                 if (pushMessageContent.sync) {
                     conversationId = pushMessageContent.sync.destination;
-                } else if (pushMessageContent.group) {
+                }
+                if (pushMessageContent.group) {
                     conversationId = pushMessageContent.group.id;
                 }
                 var conversation = new Whisper.Conversation({id: conversationId});