diff --git a/frontend/src/components/tables/ChannelsTable.jsx b/frontend/src/components/tables/ChannelsTable.jsx
index 1b2e73d7..b60ada56 100644
--- a/frontend/src/components/tables/ChannelsTable.jsx
+++ b/frontend/src/components/tables/ChannelsTable.jsx
@@ -1,4 +1,10 @@
-import React, { useEffect, useMemo, useState, useCallback } from 'react';
+import React, {
+  useEffect,
+  useMemo,
+  useState,
+  useCallback,
+  useRef,
+} from 'react';
 import useChannelsStore from '../../store/channels';
 import useLogosStore from '../../store/logos';
 import { notifications } from '@mantine/notifications';
@@ -289,7 +295,6 @@ const ChannelsTable = ({}) => {
   const [selectedProfile, setSelectedProfile] = useState(
     profiles[selectedProfileId]
   );
-  const [hasFetchedData, setHasFetchedData] = useState(false);
   const [showDisabled, setShowDisabled] = useState(true);
   const [showOnlyStreamlessChannels, setShowOnlyStreamlessChannels] =
     useState(false);
@@ -311,6 +316,8 @@ const ChannelsTable = ({}) => {
   const [isBulkDelete, setIsBulkDelete] = useState(false);
   const [channelToDelete, setChannelToDelete] = useState(null);
 
+  const hasFetchedData = useRef(false);
+
   // Column sizing state for resizable columns
   // Store in localStorage but with empty object as default
   const [columnSizing, setColumnSizing] = useLocalStorage(
@@ -365,7 +372,8 @@ const ChannelsTable = ({}) => {
     });
   });
 
-  const channelsTableLength = hasFetchedData ? Object.keys(data).length : undefined;
+  const channelsTableLength = (Object.keys(data).length > 0 || hasFetchedData.current) ?
+    Object.keys(data).length : undefined;
 
   /**
    * Functions
@@ -406,7 +414,7 @@ const ChannelsTable = ({}) => {
     ]);
 
     setIsLoading(false);
-    setHasFetchedData(true);
+    hasFetchedData.current = true;
 
     setTablePrefs({
       pageSize: pagination.pageSize,