diff --git a/xmtp_mls/src/groups/device_sync/message_sync.rs b/xmtp_mls/src/groups/device_sync/message_sync.rs
index 053dea448..c4236405c 100644
--- a/xmtp_mls/src/groups/device_sync/message_sync.rs
+++ b/xmtp_mls/src/groups/device_sync/message_sync.rs
@@ -27,8 +27,7 @@ where
         &self,
         conn: &DbConnection,
     ) -> Result<Vec<Syncable>, DeviceSyncError> {
-        let groups =
-            conn.find_groups(GroupQueryArgs::default().conversation_type(ConversationType::Group))?;
+        let groups = conn.find_groups(GroupQueryArgs::default())?;
 
         let mut all_messages = vec![];
         for StoredGroup { id, .. } in groups.into_iter() {
diff --git a/xmtp_mls/src/groups/mls_sync.rs b/xmtp_mls/src/groups/mls_sync.rs
index 4550abfc3..f9bcba57a 100644
--- a/xmtp_mls/src/groups/mls_sync.rs
+++ b/xmtp_mls/src/groups/mls_sync.rs
@@ -1045,7 +1045,9 @@ where
                             intent.id
                         );
 
-                        let messages = self.prepare_group_messages(vec![payload_slice])?;self.client
+                        let messages = self.prepare_group_messages(vec![payload_slice])?;
+
+                        self.client
                             .api()
                             .send_group_messages(messages)
                             .await?;
@@ -1464,7 +1466,8 @@ where
         let mut result = vec![];
         for payload in payloads {
             let mut sender_hmac = sender_hmac.clone();
-            sender_hmac.update(payload);
+            // When we switch to V2, update with the header bytes.
+            sender_hmac.update(&[]);
             let sender_hmac = sender_hmac.finalize();
 
             result.push(GroupMessageInput {