diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d611bbea..8db7731d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,6 @@ at anytime.
 ### Changed
   * reflector server to periodically check and set `should_announce` for sd and head blobs instead of during each request
   * reflector server to use `SQLiteStorage` to find needed blob hashes for a stream
-  * file manager startup to not block daemon startup
 
 ### Added
   * scripts to autogenerate documentation
diff --git a/lbrynet/file_manager/EncryptedFileManager.py b/lbrynet/file_manager/EncryptedFileManager.py
index efa2a88cc..96b56c0ab 100644
--- a/lbrynet/file_manager/EncryptedFileManager.py
+++ b/lbrynet/file_manager/EncryptedFileManager.py
@@ -44,8 +44,8 @@ class EncryptedFileManager(object):
     @defer.inlineCallbacks
     def setup(self):
         yield self._add_to_sd_identifier()
-        d = self._start_lbry_files()
-        d.addCallback(lambda _: log.info("Started file manager"))
+        yield self._start_lbry_files()
+        log.info("Started file manager")
 
     def get_lbry_file_status(self, lbry_file):
         return self.session.storage.get_lbry_file_status(lbry_file.rowid)