diff --git a/DemoAppSwiftUI/ChannelHeader/ChannelListQueryIdentifier.swift b/DemoAppSwiftUI/ChannelHeader/ChannelListQueryIdentifier.swift
index b8b21682..e07efe03 100644
--- a/DemoAppSwiftUI/ChannelHeader/ChannelListQueryIdentifier.swift
+++ b/DemoAppSwiftUI/ChannelHeader/ChannelListQueryIdentifier.swift
@@ -9,7 +9,6 @@ enum ChannelListQueryIdentifier: String, CaseIterable, Identifiable {
     case initial
     case archived
     case pinned
-    case unarchivedAndPinnedSorted
     
     var id: String {
         rawValue
@@ -20,7 +19,6 @@ enum ChannelListQueryIdentifier: String, CaseIterable, Identifiable {
         case .initial: "Initial Channels"
         case .archived: "Archived Channels"
         case .pinned: "Pinned Channels"
-        case .unarchivedAndPinnedSorted: "Sort by Pinned and Ignore Archived Channels"
         }
     }
 }
diff --git a/DemoAppSwiftUI/DemoAppSwiftUIApp.swift b/DemoAppSwiftUI/DemoAppSwiftUIApp.swift
index c89eb81a..0700e285 100644
--- a/DemoAppSwiftUI/DemoAppSwiftUIApp.swift
+++ b/DemoAppSwiftUI/DemoAppSwiftUIApp.swift
@@ -149,17 +149,11 @@ extension AppState {
         switch identifier {
         case .initial:
             return ChannelListQuery(
-                filter: .containMembers(userIds: [currentUserId])
-            )
-        case .unarchivedAndPinnedSorted:
-            return ChannelListQuery(
-                filter: .and([
-                    .containMembers(userIds: [currentUserId]),
-                    .equal(.archived, to: false)
-                ]),
+                filter: .containMembers(userIds: [currentUserId]),
                 sort: [
-                    .init(key: .pinnedAt, isAscending: false),
-                    .init(key: .default)
+                    Sorting(key: .pinnedAt),
+                    Sorting(key: .lastMessageAt),
+                    Sorting(key: .createdAt)
                 ]
             )
         case .archived: