diff --git a/internal/user/sync.go b/internal/user/sync.go
index 03515645..d02ca9b4 100644
--- a/internal/user/sync.go
+++ b/internal/user/sync.go
@@ -610,6 +610,10 @@ func (user *User) syncMessages(
 	}, logging.Labels{"sync-stage": "flush"})
 
 	for flushUpdate := range flushUpdateCh {
+		if flushUpdate.err != nil {
+			return flushUpdate.err
+		}
+
 		if err := vault.SetLastMessageID(flushUpdate.messageID); err != nil {
 			return fmt.Errorf("failed to set last synced message ID: %w", err)
 		}