diff --git a/web/src/app/admin/configuration/search/UpgradingPage.tsx b/web/src/app/admin/configuration/search/UpgradingPage.tsx
index 2d9415e10..60177661c 100644
--- a/web/src/app/admin/configuration/search/UpgradingPage.tsx
+++ b/web/src/app/admin/configuration/search/UpgradingPage.tsx
@@ -27,11 +27,11 @@ export default function UpgradingPage({
   const [isCancelling, setIsCancelling] = useState<boolean>(false);
 
   const { setPopup, popup } = usePopup();
-  const { data: connectors } = useSWR<Connector<any>[]>(
-    "/api/manage/connector",
-    errorHandlingFetcher,
-    { refreshInterval: 5000 } // 5 seconds
-  );
+  const { data: connectors, isLoading: isLoadingConnectors } = useSWR<
+    Connector<any>[]
+  >("/api/manage/connector", errorHandlingFetcher, {
+    refreshInterval: 5000, // 5 seconds
+  });
 
   const {
     data: ongoingReIndexingStatus,
@@ -90,6 +90,10 @@ export default function UpgradingPage({
     });
   }, [ongoingReIndexingStatus]);
 
+  if (isLoadingConnectors || isLoadingOngoingReIndexingStatus) {
+    return <ThreeDotsLoader />;
+  }
+
   return (
     <>
       {popup}
@@ -150,9 +154,7 @@ export default function UpgradingPage({
                   downtime is necessary during this transition.
                 </Text>
 
-                {isLoadingOngoingReIndexingStatus ? (
-                  <ThreeDotsLoader />
-                ) : sortedReindexingProgress ? (
+                {sortedReindexingProgress ? (
                   <ReindexingProgressTable
                     reindexingProgress={sortedReindexingProgress}
                   />