diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 974c4856..c2a8c559 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -416,6 +416,7 @@ type TimelineParams struct {
 	VouchSuggestions []models.VouchSuggestion
 	Notifications    []*models.NotificationWithEntity
 	Recents          []RecentItem
+	FollowingOnly    bool
 	// ShowNewsletter controls whether the newsletter widget/CTA is rendered.
 	// For logged-in users it reflects their newsletter_preferences row; for
 	// anonymous visitors it is always true (dismissal falls back to
diff --git a/appview/pages/templates/timeline/fragments/timeline.html b/appview/pages/templates/timeline/fragments/timeline.html
index 274da2be..64fb55d9 100644
--- a/appview/pages/templates/timeline/fragments/timeline.html
+++ b/appview/pages/templates/timeline/fragments/timeline.html
@@ -1,9 +1,39 @@
 {{ define "timeline/fragments/timeline" }}
-    <div class="py-4">
-        <h3 class="text-base dark:text-white flex items-center gap-2 px-4 py-2">
-          {{ i "gallery-vertical" "size-4 flex-shrink-0" }}
-          Timeline
-        </h3>
+    <div id="timeline-feed" class="py-4">
+        <div class="flex items-center justify-between pl-4 pb-4">
+          <h3 class="text-base dark:text-white flex items-center gap-2">
+            {{ i "gallery-vertical" "size-4 flex-shrink-0" }}
+            Timeline
+          </h3>
+          {{ if .LoggedInUser }}
+          <div class="btn-group grid grid-cols-2">
+            <a href="/timeline"
+               hx-get="/timeline"
+               hx-target="#timeline-feed"
+               hx-select="#timeline-feed"
+               hx-swap="outerHTML"
+               hx-push-url="true"
+               class="group btn-group-item inline-flex items-center justify-center {{ if not .FollowingOnly }}active{{ end }}">
+              <span class="relative inline-flex items-center justify-center">
+                <span class="group-[.htmx-request]:invisible">Global</span>
+                {{ i "loader-circle" "size-3.5 animate-spin absolute hidden group-[.htmx-request]:block" }}
+              </span>
+            </a>
+            <a href="/timeline?following=true"
+               hx-get="/timeline?following=true"
+               hx-target="#timeline-feed"
+               hx-select="#timeline-feed"
+               hx-swap="outerHTML"
+               hx-push-url="true"
+               class="group btn-group-item inline-flex items-center justify-center {{ if .FollowingOnly }}active{{ end }}">
+              <span class="relative inline-flex items-center justify-center">
+                <span class="group-[.htmx-request]:invisible">Following</span>
+                {{ i "loader-circle" "size-3.5 animate-spin absolute hidden group-[.htmx-request]:block" }}
+              </span>
+            </a>
+          </div>
+          {{ end }}
+        </div>
 
         <div class="flex flex-col gap-4">
           {{ range $i, $g := .Timeline }}
diff --git a/appview/state/timeline.go b/appview/state/timeline.go
index 7290b260..c81a08dc 100644
--- a/appview/state/timeline.go
+++ b/appview/state/timeline.go
@@ -49,14 +49,13 @@ func (s *State) HomeOrTimeline(w http.ResponseWriter, r *http.Request) {
 func (s *State) Timeline(w http.ResponseWriter, r *http.Request) {
 	user := s.oauth.GetMultiAccountUser(r)
 
-	// TODO: set this flag based on the UI
-	filtered := false
+	followingOnly := r.URL.Query().Get("following") == "true" && user != nil
 
 	var userDid string
 	if user != nil {
 		userDid = user.Did
 	}
-	timeline, err := db.MakeTimeline(s.db, 50, userDid, filtered)
+	timeline, err := db.MakeTimeline(s.db, 50, userDid, followingOnly)
 	if err != nil {
 		s.logger.Error("failed to make timeline", "err", err)
 		s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.")
@@ -124,6 +123,7 @@ func (s *State) Timeline(w http.ResponseWriter, r *http.Request) {
 		VouchSuggestions: vouchSuggestions,
 		Notifications:    notifications,
 		Recents:          recents,
+		FollowingOnly:    followingOnly,
 		ShowNewsletter:   s.showNewsletter(user),
 	})
 }