diff --git a/src/File/FileServer.py b/src/File/FileServer.py
index 33dc7ff7..c2a7d7d0 100644
--- a/src/File/FileServer.py
+++ b/src/File/FileServer.py
@@ -498,7 +498,7 @@ class FileServer(ConnectionServer):
             log.info("No network activity for %.2fs. Running an update for a random site.",
                 now - last_activity_time
             )
-            self.update_pool.spawn(self.updateRandomSite)
+            self.update_pool.spawn(self.updateRandomSite, force=True)
 
     # Periodic reloading of tracker files
     def reloadTrackerFilesThread(self):
@@ -576,6 +576,10 @@ class FileServer(ConnectionServer):
             from Debug import DebugReloader
             DebugReloader.watcher.addCallback(self.reload)
 
+        # XXX: for initializing self.sites
+        # Remove this line when self.sites gets completely unused
+        self.getSites()
+
         if not passive_mode:
             self.spawn(self.updateSites)
             thread_reaload_tracker_files = self.spawn(self.reloadTrackerFilesThread)