diff --git a/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt b/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt
index dfd15326a..ddf0c9559 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt
@@ -71,7 +71,8 @@ rb.emojis as 'rb_emojis', rb.bot as 'rb_bot'
 FROM TimelineStatusEntity s
 LEFT JOIN TimelineAccountEntity a ON (s.timelineUserId = a.timelineUserId AND s.authorServerId = a.serverId)
 LEFT JOIN TimelineAccountEntity rb ON (s.timelineUserId = rb.timelineUserId AND s.reblogAccountId = rb.serverId)
-WHERE s.serverId = :statusId OR s.reblogServerId = :statusId"""
+WHERE (s.serverId = :statusId OR s.reblogServerId = :statusId) 
+AND s.authorServerId IS NOT NULL"""
     )
     abstract suspend fun getStatus(statusId: String): TimelineStatusWithAccount?