diff --git a/Tusker/CoreData/AccountPreferences.swift b/Tusker/CoreData/AccountPreferences.swift
index bdc84472..53f990d1 100644
--- a/Tusker/CoreData/AccountPreferences.swift
+++ b/Tusker/CoreData/AccountPreferences.swift
@@ -24,15 +24,17 @@ public final class AccountPreferences: NSManagedObject {
     @NSManaged var createdAt: Date
     @NSManaged var pinnedTimelinesData: Data?
     
-    @LazilyDecoding(from: \AccountPreferences.pinnedTimelinesData, fallback: [])
+    @LazilyDecoding(from: \AccountPreferences.pinnedTimelinesData, fallback: AccountPreferences.defaultPinnedTimelines)
     var pinnedTimelines: [PinnedTimeline]
     
     static func `default`(account: LocalData.UserAccountInfo, context: NSManagedObjectContext) -> AccountPreferences {
         let prefs = AccountPreferences(context: context)
         prefs.accountID = account.id
         prefs.createdAt = Date()
-        prefs.pinnedTimelines = [.home, .public(local: true), .public(local: false)]
+        prefs.pinnedTimelines = Self.defaultPinnedTimelines
         return prefs
     }
     
+    private static let defaultPinnedTimelines = [PinnedTimeline.home, .public(local: true), .public(local: false)]
+    
 }