diff --git a/core/src/main/groovy/com/muwire/core/filefeeds/FeedManager.groovy b/core/src/main/groovy/com/muwire/core/filefeeds/FeedManager.groovy
index 418eaa5b..52b3baaf 100644
--- a/core/src/main/groovy/com/muwire/core/filefeeds/FeedManager.groovy
+++ b/core/src/main/groovy/com/muwire/core/filefeeds/FeedManager.groovy
@@ -48,7 +48,7 @@ class FeedManager {
     }
     
     public Set<FeedItem> getFeedItems(Persona persona) {
-        feedItems.get(persona)
+        feedItems.getOrDefault(persona, Collections.emptySet())
     }
     
     public List<Feed> getFeedsToUpdate() {