diff --git a/apps/web/src/components/app/Sidebar/Sidebar.tsx b/apps/web/src/components/app/Sidebar/Sidebar.tsx
index 30027e3..876e15f 100644
--- a/apps/web/src/components/app/Sidebar/Sidebar.tsx
+++ b/apps/web/src/components/app/Sidebar/Sidebar.tsx
@@ -25,9 +25,9 @@ export default function Sidebar({ ...props }: React.ComponentProps<typeof UISide
 
   if (isLoading) return <SidebarSkeleton {...props} />;
 
-  const alwaysOnStreamers = stream?.filter((s) => s.channel.is247) || [];
+  const alwaysOnStreamers = stream?.filter((s) => s.isLive && s.channel.is247) || [];
   const liveStreamers = stream?.filter((s) => s.isLive && !s.channel.is247) || [];
-  const offlineStreamers = stream?.filter((s) => !s.isLive && !s.channel.is247) || [];
+  const offlineStreamers = stream?.filter((s) => !s.isLive) || [];
 
   return (
     <UISidebar collapsible="icon" {...props}>
diff --git a/apps/web/src/components/app/StreamGrid/StreamGrid.tsx b/apps/web/src/components/app/StreamGrid/StreamGrid.tsx
index 806e405..6cfc3de 100644
--- a/apps/web/src/components/app/StreamGrid/StreamGrid.tsx
+++ b/apps/web/src/components/app/StreamGrid/StreamGrid.tsx
@@ -25,7 +25,7 @@ export default function StreamGrid({ liveStreams, offlineStreams }: StreamGridPr
     .filter((stream) => !stream.channel.is247)
     .sort((a, b) => b.viewers - a.viewers);
   const alwaysOnStreams = [...liveStreams, ...offlineStreams]
-    .filter((stream) => stream.channel.is247)
+    .filter((stream) => stream.isLive && stream.channel.is247)
     .sort((a, b) => {
       if (a.isLive !== b.isLive) {
         return Number(b.isLive) - Number(a.isLive);
@@ -38,7 +38,6 @@ export default function StreamGrid({ liveStreams, offlineStreams }: StreamGridPr
       return a.channel.name.localeCompare(b.channel.name);
     });
   const sortedOfflineStreams = offlineStreams
-    .filter((stream) => !stream.channel.is247)
     .sort((a, b) => a.channel.name.localeCompare(b.channel.name));
   const hasVisibleLiveStreams = sortedLiveStreams.length > 0 || alwaysOnStreams.some((stream) => stream.isLive);