diff --git a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
index e39f4b62d..7c0be7856 100644
--- a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
@@ -47,8 +47,11 @@ import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
@@ -61,6 +64,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
+import static java.util.Collections.singletonList;
 import static java.util.Collections.sort;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
@@ -195,12 +199,7 @@ class FeedManagerImpl implements FeedManager, EventListener, OpenDatabaseHook,
 		Feed updatedFeed = feedFactory.updateFeed(feed, sf, lastEntryTime);
 
 		// store feed metadata again to also store last entry time
-		db.transaction(false, txn -> {
-			List<Feed> feeds = getFeeds(txn);
-			feeds.remove(feed);
-			feeds.add(updatedFeed);
-			storeFeeds(txn, feeds);
-		});
+		updateFeeds(singletonList(updatedFeed));
 
 		return updatedFeed;
 	}
@@ -270,8 +269,23 @@ class FeedManagerImpl implements FeedManager, EventListener, OpenDatabaseHook,
 		}
 	}
 
-	private void storeFeeds(List<Feed> feeds) throws DbException {
-		db.transaction(false, txn -> storeFeeds(txn, feeds));
+	/**
+	 * Updates the given feeds in the stored list of feeds, without affecting
+	 * any other feeds in the list or re-adding any of the given feeds that
+	 * have been removed from the list.
+	 */
+	private void updateFeeds(List<Feed> updatedFeeds) throws DbException {
+		Map<GroupId, Feed> updatedMap = new HashMap<>();
+		for (Feed feed : updatedFeeds) updatedMap.put(feed.getBlogId(), feed);
+		db.transaction(false, txn -> {
+			List<Feed> feeds = getFeeds(txn);
+			ListIterator<Feed> it = feeds.listIterator();
+			while (it.hasNext()) {
+				Feed updated = updatedMap.get(it.next().getBlogId());
+				if (updated != null) it.set(updated);
+			}
+			storeFeeds(txn, feeds);
+		});
 	}
 
 	/**
@@ -297,8 +311,13 @@ class FeedManagerImpl implements FeedManager, EventListener, OpenDatabaseHook,
 			return;
 		}
 
+		if (feeds.isEmpty()) {
+			LOG.info("No RSS feeds to update");
+			return;
+		}
+
 		// Fetch and update all feeds
-		List<Feed> newFeeds = new ArrayList<>(feeds.size());
+		List<Feed> updatedFeeds = new ArrayList<>(feeds.size());
 		for (Feed feed : feeds) {
 			try {
 				String url = feed.getProperties().getUrl();
@@ -307,16 +326,16 @@ class FeedManagerImpl implements FeedManager, EventListener, OpenDatabaseHook,
 				SyndFeed sf = fetchSyndFeed(url);
 				// sort and add new entries
 				long lastEntryTime = postFeedEntries(feed, sf.getEntries());
-				newFeeds.add(feedFactory.updateFeed(feed, sf, lastEntryTime));
+				updatedFeeds.add(
+						feedFactory.updateFeed(feed, sf, lastEntryTime));
 			} catch (IOException | DbException e) {
 				logException(LOG, WARNING, e);
-				newFeeds.add(feed);
 			}
 		}
 
 		// Store updated feeds
 		try {
-			storeFeeds(newFeeds);
+			updateFeeds(updatedFeeds);
 		} catch (DbException e) {
 			logException(LOG, WARNING, e);
 		}
diff --git a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java
index cf7e38104..f7d011149 100644
--- a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerImplTest.java
@@ -103,7 +103,7 @@ public class FeedManagerImplTest extends BrambleMockTestCase {
 	public void testFetchFeedsEmptyList() throws Exception {
 		// The list of feeds is empty
 		expectGetFeeds();
-		expectStoreFeeds();
+
 		feedManager.setTorActive(true);
 		feedManager.fetchFeeds();
 	}
@@ -120,7 +120,7 @@ public class FeedManagerImplTest extends BrambleMockTestCase {
 		Feed feed = createFeed(url, blog);
 
 		expectGetFeeds(feed);
-		expectStoreFeeds(feed);
+		expectGetAndStoreFeeds(feed);
 
 		feedManager.setTorActive(true);
 		feedManager.fetchFeeds();
@@ -136,7 +136,7 @@ public class FeedManagerImplTest extends BrambleMockTestCase {
 		Feed feed = createFeed(url, blog);
 
 		expectGetFeeds(feed);
-		expectStoreFeeds(feed);
+		expectGetAndStoreFeeds(feed);
 
 		feedManager.setTorActive(true);
 		feedManager.fetchFeeds();
@@ -155,7 +155,7 @@ public class FeedManagerImplTest extends BrambleMockTestCase {
 
 		expectGetFeeds(feed);
 		expectUpdateFeedNoEntries(feed);
-		expectStoreFeeds(feed);
+		expectGetAndStoreFeeds(feed);
 
 		feedManager.setTorActive(true);
 		feedManager.fetchFeeds();
@@ -176,7 +176,7 @@ public class FeedManagerImplTest extends BrambleMockTestCase {
 
 		expectGetFeeds(feed);
 		expectUpdateFeedOneEntry(feed);
-		expectStoreFeeds(feed);
+		expectGetAndStoreFeeds(feed);
 
 		feedManager.setTorActive(true);
 		feedManager.fetchFeeds();
@@ -298,14 +298,6 @@ public class FeedManagerImplTest extends BrambleMockTestCase {
 		}});
 	}
 
-	private void expectStoreFeeds(Feed... feeds) throws Exception {
-		Transaction txn = new Transaction(null, false);
-		context.checking(new DbExpectations() {{
-			oneOf(db).transaction(with(false), withDbRunnable(txn));
-		}});
-		expectStoreFeeds(txn, feeds);
-	}
-
 	private void expectStoreFeeds(Transaction txn, Feed... feeds)
 			throws Exception {
 		BdfList feedList = new BdfList();