diff --git a/chrome/content/zotero/xpcom/data/feeds.js b/chrome/content/zotero/xpcom/data/feeds.js
index fe4e1ffc2..0c5d2f5e0 100644
--- a/chrome/content/zotero/xpcom/data/feeds.js
+++ b/chrome/content/zotero/xpcom/data/feeds.js
@@ -204,6 +204,7 @@ Zotero.Feeds = new function() {
 		Zotero.debug("Running update for feeds: " + needUpdate.join(', '));
 		for (let i=0; i<needUpdate.length; i++) {
 			let feed = Zotero.Feeds.get(needUpdate[i]);
+			yield feed.waitForDataLoad('item');
 			yield feed._updateFeed();
 		}
 		
diff --git a/chrome/content/zotero/xpcom/data/library.js b/chrome/content/zotero/xpcom/data/library.js
index cf5662a34..42136fc70 100644
--- a/chrome/content/zotero/xpcom/data/library.js
+++ b/chrome/content/zotero/xpcom/data/library.js
@@ -371,6 +371,9 @@ Zotero.Library.prototype.setDataLoaded = function (objectType) {
 	this._dataLoadedDeferreds[objectType].resolve();
 };
 
+/**
+ * Wait for a given data type to load, loading it now if necessary
+ */
 Zotero.Library.prototype.waitForDataLoad = Zotero.Promise.coroutine(function* (objectType) {
 	if (this.getDataLoaded(objectType)) return;
 	
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 0055b8586..198bd4039 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -631,7 +631,8 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 				yield Zotero.Relations.init();
 				yield Zotero.Feeds.init();
 				
-				// Load all library data except for items
+				// Load all library data except for items, which are loaded when libraries are first
+				// clicked on or if otherwise necessary
 				yield Zotero.Promise.each(
 					Zotero.Libraries.getAll(),
 					library => Zotero.Promise.coroutine(function* () {