diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 2d0bfc28..6795430b 100644
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -444,6 +444,7 @@ gen_terms_part (Xapian::TermGenerator term_gen,
 	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
     {
 	add_term (term_gen.get_document (), "label", "attachment");
+	return;
     }
 
     byte_array = g_byte_array_new ();