diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt
index aa13879a0..388d6ce0c 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt
@@ -17,9 +17,9 @@ object ChannelFeedFilter: FeedFilter<Note>() {
   // returns the last Note of each user.
   override fun feed(): List<Note> {
     return channel.notes
-      ?.values
-      ?.filter { account.isAcceptable(it) }
-      ?.sortedBy { it.createdAt() }
-      ?.reversed() ?: emptyList()
+      .values
+      .filter { account.isAcceptable(it) }
+      .sortedBy { it.createdAt() }
+      .reversed()
   }
 }