diff --git a/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift b/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
index 9e9fe8cc..f4b9852b 100644
--- a/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
+++ b/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
@@ -61,7 +61,7 @@ struct TimelineTab: View {
         if client.isAuth {
           timeline = lastTimelineFilter
         } else {
-          timeline = .federated
+          timeline = .trending
         }
       }
       Task {
@@ -125,8 +125,10 @@ struct TimelineTab: View {
   private var timelineFilterButton: some View {
     headerGroup
     timelineFiltersButtons
-    listsFiltersButons
-    tagsFiltersButtons
+    if client.isAuth {
+      listsFiltersButons
+      tagsFiltersButtons
+    }
     localTimelinesFiltersButtons
     tagGroupsFiltersButtons
     Divider()
@@ -325,7 +327,7 @@ struct TimelineTab: View {
     if client.isAuth, canFilterTimeline {
       timeline = lastTimelineFilter
     } else if !client.isAuth {
-      timeline = .federated
+      timeline = .trending
     }
   }
 }
diff --git a/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift b/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
index 85c9a4e8..0cbbc660 100644
--- a/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
+++ b/Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
@@ -49,7 +49,7 @@ import SwiftUI
   private(set) var datasource = TimelineDatasource()
   private let cache = TimelineCache()
   private var isCacheEnabled: Bool {
-    canFilterTimeline && timeline.supportNewestPagination
+    canFilterTimeline && timeline.supportNewestPagination && client?.isAuth == true
   }
 
   @ObservationIgnored