diff --git a/src/Content/ContentDb.py b/src/Content/ContentDb.py
index 5d208beb..cc3b9ae7 100644
--- a/src/Content/ContentDb.py
+++ b/src/Content/ContentDb.py
@@ -58,6 +58,10 @@ class ContentDb(Db):
         }
 
         return schema
+
+    def initSite(self, site):
+        self.sites[site.address] = site
+
             for row in self.execute("SELECT * FROM site"):
                 self.site_ids[row["address"]] = row["site_id"]
         return self.site_ids[site_address]
diff --git a/src/Content/ContentManager.py b/src/Content/ContentManager.py
index 3b8508c7..b98ec2e2 100644
--- a/src/Content/ContentManager.py
+++ b/src/Content/ContentManager.py
@@ -38,6 +38,7 @@ class ContentManager(object):
         elif self.contents.get("content.json") and self.getOptionalSize() > 0:
             self.site.storage.updateBadFiles()  # No hashfield cache created yet
             self.has_optional_files = True
+        self.contents.db.initSite(self.site)
 
     # Load content.json to self.content
     # Return: Changed files ["index.html", "data/messages.json"], Deleted files ["old.jpg"]