diff --git a/package/src/components/ChannelList/hooks/usePaginatedChannels.ts b/package/src/components/ChannelList/hooks/usePaginatedChannels.ts
index 812fb1e4e..d2b31c5a5 100644
--- a/package/src/components/ChannelList/hooks/usePaginatedChannels.ts
+++ b/package/src/components/ChannelList/hooks/usePaginatedChannels.ts
@@ -2,8 +2,6 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 
 import type { Channel, ChannelFilters, ChannelOptions, ChannelSort } from 'stream-chat';
 
-import { useActiveChannelsRefContext } from '../../../contexts/activeChannelsRefContext/ActiveChannelsRefContext';
-
 import { useChatContext } from '../../../contexts/chatContext/ChatContext';
 import { useIsMountedRef } from '../../../hooks/useIsMountedRef';
 
@@ -52,8 +50,6 @@ export const usePaginatedChannels = <
   const [staticChannelsActive, setStaticChannelsActive] = useState<boolean>(false);
   const [activeQueryType, setActiveQueryType] = useState<QueryType | null>('queryLocalDB');
   const [hasNextPage, setHasNextPage] = useState<boolean>(false);
-
-  const activeChannels = useActiveChannelsRefContext();
   const isMountedRef = useIsMountedRef();
   const { client } = useChatContext<StreamChatGenerics>();
 
@@ -111,10 +107,7 @@ export const usePaginatedChannels = <
         }
       }
 
-      // TODO: Think about the implications of this.
-      const channelQueryResponse = await client.queryChannels(filters, sort, newOptions, {
-        skipInitialization: enableOfflineSupport ? activeChannelIds : activeChannels.current,
-      });
+      const channelQueryResponse = await client.queryChannels(filters, sort, newOptions);
       if (isQueryStale() || !isMountedRef.current) {
         return;
       }
diff --git a/package/src/utils/DBSyncManager.ts b/package/src/utils/DBSyncManager.ts
index 82697a0a2..1cecbc22f 100644
--- a/package/src/utils/DBSyncManager.ts
+++ b/package/src/utils/DBSyncManager.ts
@@ -80,6 +80,7 @@ export class DBSyncManager {
    */
   static onSyncStatusChange = (listener: (status: boolean) => void) => {
     this.listeners.push(listener);
+    listener(this.syncStatus);
 
     return {
       unsubscribe: () => {