diff --git a/packages/stream_chat_v1/lib/channel_list_page.dart b/packages/stream_chat_v1/lib/channel_list_page.dart
index be43bd6..d484307 100644
--- a/packages/stream_chat_v1/lib/channel_list_page.dart
+++ b/packages/stream_chat_v1/lib/channel_list_page.dart
@@ -40,7 +40,15 @@ class _ChannelListPageState extends State<ChannelListPage> {
             Positioned(
               top: -3,
               right: -16,
-              child: UnreadIndicator(),
+              child: StreamBuilder(
+                stream:
+                    StreamChat.of(context).client.state.unreadChannelsStream,
+                initialData: 0,
+                builder:
+                    (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
+                  return Text(snapshot.data.toString());
+                },
+              ),
             ),
           ],
         ),
diff --git a/packages/stream_chat_v1/lib/chat_info_screen.dart b/packages/stream_chat_v1/lib/chat_info_screen.dart
index 2ba0789..c6b6a8c 100644
--- a/packages/stream_chat_v1/lib/chat_info_screen.dart
+++ b/packages/stream_chat_v1/lib/chat_info_screen.dart
@@ -245,12 +245,13 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
                         if (channel.state == null) {
                           await channel.watch();
                         }
-                        Navigator.pushNamed(
+                        Navigator.pushNamedAndRemoveUntil(
                           context,
                           Routes.CHANNEL_PAGE,
+                          ModalRoute.withName(Routes.CHANNEL_LIST_PAGE),
                           arguments: ChannelPageArgs(
-                            channel: channel,
-                            initialMessage: message,
+                            channel: c,
+                            initialMessage: m,
                           ),
                         );
                       },
diff --git a/packages/stream_chat_v1/lib/group_chat_details_screen.dart b/packages/stream_chat_v1/lib/group_chat_details_screen.dart
index df40cc5..7dec664 100644
--- a/packages/stream_chat_v1/lib/group_chat_details_screen.dart
+++ b/packages/stream_chat_v1/lib/group_chat_details_screen.dart
@@ -144,7 +144,7 @@ class _GroupChatDetailsScreenState extends State<GroupChatDetailsScreen> {
                           Navigator.pushNamedAndRemoveUntil(
                             context,
                             Routes.CHANNEL_PAGE,
-                            ModalRoute.withName(Routes.HOME),
+                            ModalRoute.withName(Routes.CHANNEL_LIST_PAGE),
                             arguments: ChannelPageArgs(channel: channel),
                           );
                         } catch (err) {
diff --git a/packages/stream_chat_v1/lib/group_info_screen.dart b/packages/stream_chat_v1/lib/group_info_screen.dart
index 6a06e1e..b518163 100644
--- a/packages/stream_chat_v1/lib/group_info_screen.dart
+++ b/packages/stream_chat_v1/lib/group_info_screen.dart
@@ -534,9 +534,10 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
                         if (channel.state == null) {
                           await channel.watch();
                         }
-                        Navigator.pushNamed(
+                        Navigator.pushNamedAndRemoveUntil(
                           context,
                           Routes.CHANNEL_PAGE,
+                          ModalRoute.withName(Routes.CHANNEL_LIST_PAGE),
                           arguments: ChannelPageArgs(
                             channel: channel,
                             initialMessage: message,