diff --git a/app-sync.js b/app-sync.js
index c275690..b8c3d9d 100644
--- a/app-sync.js
+++ b/app-sync.js
@@ -139,9 +139,16 @@ app.post('/sync', async (req, res) => {
   for (let i = 0; i < newMessages.length; i++) {
     let msg = newMessages[i];
     let envelopePb = new SyncPb.MessageEnvelope();
+    let messagePb = new SyncPb.Message();
+
+    messagePb.setDataset(msg.dataset);
+    messagePb.setRow(msg.row);
+    messagePb.setColumn(msg.column);
+    messagePb.setValue(msg.value);
+
     envelopePb.setTimestamp(msg.timestamp);
-    envelopePb.setIsencrypted(msg.is_encrypted === 1);
-    envelopePb.setContent(msg.content);
+    envelopePb.setContent(messagePb.serializeBinary());
+
     responsePb.addMessages(envelopePb);
   }
 
diff --git a/sync-full.js b/sync-full.js
index 763ebdc..fe1f2b7 100644
--- a/sync-full.js
+++ b/sync-full.js
@@ -27,7 +27,7 @@ const sync = sequential(async function syncAPI(messages, since, fileId) {
     };
   });
 
-  let newMessages = actual.internal.syncAndReceiveMessages(messages, since);
+  let newMessages = await actual.internal.syncAndReceiveMessages(messages, since);
 
   return {
     trie: actual.internal.timestamp.getClock().merkle,