diff --git a/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx b/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
index 4043f67a328..88b317fcd1d 100644
--- a/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
+++ b/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
@@ -16,6 +16,7 @@ import {
   ConnectorSummary,
   GroupedConnectorSummaries,
   ValidSources,
+  ValidStatuses,
 } from "@/lib/types";
 import { useRouter } from "next/navigation";
 import {
@@ -156,7 +157,13 @@ border border-border dark:border-neutral-700
       </TableCell>
       <TableCell>
         <CCPairStatus
-          ccPairStatus={ccPairsIndexingStatus.cc_pair_status}
+          ccPairStatus={
+            ccPairsIndexingStatus.last_finished_status !== null
+              ? ccPairsIndexingStatus.cc_pair_status
+              : ccPairsIndexingStatus.last_status == "not_started"
+                ? ConnectorCredentialPairStatus.SCHEDULED
+                : ConnectorCredentialPairStatus.INITIAL_INDEXING
+          }
           inRepeatedErrorState={ccPairsIndexingStatus.in_repeated_error_state}
           lastIndexAttemptStatus={
             ccPairsIndexingStatus.latest_index_attempt?.status
@@ -324,7 +331,7 @@ export function CCPairIndexingStatusTable({
         if (filterOptions.lastStatus && filterOptions.lastStatus.length > 0) {
           if (
             !filterOptions.lastStatus.includes(
-              status.last_finished_status as any
+              status.last_status as ValidStatuses
             )
           ) {
             return false;