diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.kt
index bb42e46f..1af707fc 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.kt
@@ -381,7 +381,7 @@ class TimelineFragment : SFragment(), OnRefreshListener, StatusActionListener, I
         if (!eventRegistered) {
             eventHub.events
                     .observeOn(AndroidSchedulers.mainThread())
-                    .autoDispose(from(this))
+                    .autoDispose(from(this, Lifecycle.Event.ON_DESTROY))
                     .subscribe { event: Event? ->
                         when (event) {
                             is FavoriteEvent -> handleFavEvent(event)