diff --git a/Mastodon/Extension/CoreDataStack/Toot.swift b/Mastodon/Extension/CoreDataStack/Toot.swift
index f71fa949..2fab537e 100644
--- a/Mastodon/Extension/CoreDataStack/Toot.swift
+++ b/Mastodon/Extension/CoreDataStack/Toot.swift
@@ -22,7 +22,7 @@ extension Toot.Property {
             spoilerText: entity.spoilerText,
             reblogsCount: NSNumber(value: entity.reblogsCount),
             favouritesCount: NSNumber(value: entity.favouritesCount),
-            repliesCount: (entity.repliesCount != nil) ? NSNumber(value: entity.repliesCount!) : nil,
+            repliesCount: entity.repliesCount.flatMap { NSNumber(value: $0) },
             url: entity.uri,
             inReplyToID: entity.inReplyToID,
             inReplyToAccountID: entity.inReplyToAccountID,