diff --git a/src/classes/DataBoard.coffee b/src/classes/DataBoard.coffee
index 0654933aa..d308ec544 100644
--- a/src/classes/DataBoard.coffee
+++ b/src/classes/DataBoard.coffee
@@ -2,7 +2,7 @@ class DataBoard
   @keys = ['hiddenThreads', 'hiddenPosts', 'lastReadPosts', 'yourPosts', 'watchedThreads', 'customTitles']
 
   constructor: (@key, sync, dontClean) ->
-    @data = Conf[@key]
+    @initData Conf[@key]
     $.sync @key, @onSync
     @clean() unless dontClean
     return unless sync
@@ -13,7 +13,13 @@ class DataBoard
       @sync = sync
     $.on d, '4chanXInitFinished', init
 
-  save: (cb) -> $.set @key, @data, cb
+  initData: (@allData) ->
+    if Site.hostname is '4chan.org' and @allData.boards
+      @data = @allData
+    else
+      @data = (@allData[Site.hostname] or= boards: {})
+
+  save: (cb) -> $.set @key, @allData, cb
 
   delete: ({boardID, threadID, postID}) ->
     $.forceSync @key
@@ -112,5 +118,5 @@ class DataBoard
     @save()
 
   onSync: (data) =>
-    @data = data or boards: {}
+    @initData data
     @sync?()
diff --git a/src/main/Main.coffee b/src/main/Main.coffee
index 529918c48..b06931ae0 100644
--- a/src/main/Main.coffee
+++ b/src/main/Main.coffee
@@ -53,7 +53,7 @@ Main =
     flatten null, Config
 
     for db in DataBoard.keys
-      Conf[db] = boards: {}
+      Conf[db] = {}
     Conf['boardConfig'] = boards: {}
     Conf['archives'] = Redirect.archives
     Conf['selectedArchives'] = {}