diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js
index ead810d4a8..4f0a034961 100644
--- a/chrome/content/zotero/xpcom/data/items.js
+++ b/chrome/content/zotero/xpcom/data/items.js
@@ -1873,12 +1873,14 @@ Zotero.Items = function() {
 					if (item.key == foundKey) {
 						continue;
 					}
-					// More than 1 attachment found
 					return MAX_ITEMS;
 				}
 				foundKey = item.key;
 				num++;
 			}
+			if (num >= MAX_ITEMS) {
+				break;
+			}
 		}
 		return num;
 	};