diff --git a/core/src/main/groovy/com/muwire/core/Core.groovy b/core/src/main/groovy/com/muwire/core/Core.groovy
index 50105913..78fc7f1a 100644
--- a/core/src/main/groovy/com/muwire/core/Core.groovy
+++ b/core/src/main/groovy/com/muwire/core/Core.groovy
@@ -404,6 +404,7 @@ public class Core {
         log.info("initializing feed manager")
         feedManager = new FeedManager(eventBus, home)
         eventBus.with { 
+            register(UILoadedEvent.class, feedManager)
             register(FeedItemFetchedEvent.class, feedManager)
             register(FeedFetchEvent.class, feedManager)
             register(UIFeedConfigurationEvent.class, feedManager)
@@ -557,7 +558,6 @@ public class Core {
         connectionEstablisher.start()
         hostCache.waitForLoad()
         updateClient?.start()
-        feedManager.start()
         feedClient.start()
         trackerResponder.start()
 
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 f0b6dcb5..683d6155 100644
--- a/core/src/main/groovy/com/muwire/core/filefeeds/FeedManager.groovy
+++ b/core/src/main/groovy/com/muwire/core/filefeeds/FeedManager.groovy
@@ -1,5 +1,7 @@
 package com.muwire.core.filefeeds
 
+import com.muwire.core.UILoadedEvent
+
 import java.nio.file.Files
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ExecutorService
@@ -59,7 +61,7 @@ class FeedManager {
             .collect(Collectors.toList())
     }
     
-    void start() {
+    void onUILoadedEvent(UILoadedEvent event) {
         log.info("starting feed manager")
         persister.submit({loadFeeds()} as Runnable)
         persister.submit({loadItems()} as Runnable)