1c7b0e8
diff --git a/imap/conversations.c b/imap/conversations.c
1c7b0e8
index 504c5db..2b151dc 100644
1c7b0e8
--- a/imap/conversations.c
1c7b0e8
+++ b/imap/conversations.c
1c7b0e8
@@ -560,11 +560,14 @@ EXPORTED int conversations_get_msgid(struct conversations_state *state,
1c7b0e8
                       &data, &datalen,
1c7b0e8
                       &state->txn);
1c7b0e8
 
1c7b0e8
+    if (r == CYRUSDB_NOTFOUND)
1c7b0e8
+        return 0; /* not an error, but nothing more to do */
1c7b0e8
+
1c7b0e8
     if (!r) r = _conversations_parse(data, datalen, cids, NULL);
1c7b0e8
 
1c7b0e8
     if (r) arrayu64_truncate(cids, 0);
1c7b0e8
 
1c7b0e8
-    return 0;
1c7b0e8
+    return r;
1c7b0e8
 }
1c7b0e8
 
1c7b0e8
 /*