diff --git a/Packages/Models/Sources/Models/Alias/ServerDate.swift b/Packages/Models/Sources/Models/Alias/ServerDate.swift
index 673ac5c4..a03e4e78 100644
--- a/Packages/Models/Sources/Models/Alias/ServerDate.swift
+++ b/Packages/Models/Sources/Models/Alias/ServerDate.swift
@@ -47,7 +47,7 @@ public struct ServerDate: Codable, Hashable, Equatable {
       // Decode from server
       let container = try decoder.singleValueContainer()
       let stringDate = try container.decode(String.self)
-      asDate = Self.createdAtDateFormatter.date(from: stringDate)!
+      asDate = Self.createdAtDateFormatter.date(from: stringDate) ?? Date()
     } catch {
       // Decode from cache
       let container = try decoder.container(keyedBy: CodingKeys.self)
diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
index fc7caf0e..cf5ed8de 100644
--- a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
+++ b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
@@ -235,6 +235,7 @@ public struct StatusEditorView: View {
                                   avatarSize: .status)
         } else {
           AvatarView(url: account.avatar, size: .status)
+            .environmentObject(theme)
         }
         VStack(alignment: .leading, spacing: 4) {
           privacyMenu