diff --git a/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala b/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala
index ab3f0e28..703e0cc6 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala
@@ -57,7 +57,14 @@ private class Geary.ImapEngine.ListEmailByID : Geary.ImapEngine.AbstractListEmai
                     add_unfulfilled_fields(uid, required_fields.clear(email.fields));
             }
         }
-        
+
+        if (this.flags.is_including_id() && this.initial_uid == null) {
+            throw new EngineError.NOT_FOUND(
+                "Initial id not found in local set: %s",
+                this.initial_id.to_string()
+            );
+        }
+
         // report fulfilled items
         fulfilled_count = fulfilled.size;
         if (fulfilled_count > 0)