diff --git a/airbyte-webapp/src/components/destination/DestinationsTable/DestinationsTable.tsx b/airbyte-webapp/src/components/destination/DestinationsTable/DestinationsTable.tsx
index 38af6be321022..5262ef66a2910 100644
--- a/airbyte-webapp/src/components/destination/DestinationsTable/DestinationsTable.tsx
+++ b/airbyte-webapp/src/components/destination/DestinationsTable/DestinationsTable.tsx
@@ -14,7 +14,7 @@ interface DestinationsTableProps {
 
 export const DestinationsTable: React.FC<DestinationsTableProps> = ({ destinations }) => {
   const navigate = useNavigate();
-  const { connections } = useConnectionList();
+  const { connections } = useConnectionList({ destinationId: destinations.map(({ destinationId }) => destinationId) });
 
   const data = getEntityTableData(destinations, connections, "destination");
 
diff --git a/airbyte-webapp/src/pages/SourcesPage/pages/AllSourcesPage/components/SourcesTable.tsx b/airbyte-webapp/src/pages/SourcesPage/pages/AllSourcesPage/components/SourcesTable.tsx
index f6b028b7833c6..b6da2f6b026e0 100644
--- a/airbyte-webapp/src/pages/SourcesPage/pages/AllSourcesPage/components/SourcesTable.tsx
+++ b/airbyte-webapp/src/pages/SourcesPage/pages/AllSourcesPage/components/SourcesTable.tsx
@@ -15,7 +15,7 @@ interface SourcesTableProps {
 const SourcesTable: React.FC<SourcesTableProps> = ({ sources }) => {
   const navigate = useNavigate();
 
-  const { connections } = useConnectionList();
+  const { connections } = useConnectionList({ sourceId: sources.map(({ sourceId }) => sourceId) });
 
   const data = getEntityTableData(sources, connections, "source");
 
diff --git a/airbyte-webapp/src/pages/destination/DestinationSettingsPage/DestinationSettingsPage.tsx b/airbyte-webapp/src/pages/destination/DestinationSettingsPage/DestinationSettingsPage.tsx
index 37532cae4e0d3..33cd33acb4193 100644
--- a/airbyte-webapp/src/pages/destination/DestinationSettingsPage/DestinationSettingsPage.tsx
+++ b/airbyte-webapp/src/pages/destination/DestinationSettingsPage/DestinationSettingsPage.tsx
@@ -19,10 +19,7 @@ import styles from "./DestinationSettings.module.scss";
 export const DestinationSettingsPage: React.FC = () => {
   const params = useParams() as { "*": StepsTypes | ""; id: string };
   const destination = useGetDestination(params.id);
-  const { connections } = useConnectionList();
-  const connectionsWithDestination = connections.filter(
-    ({ destination: { destinationId } }) => destinationId === destination.destinationId
-  );
+  const { connections: connectionsWithDestination } = useConnectionList({ destinationId: [destination.destinationId] });
   const destinationSpecification = useGetDestinationDefinitionSpecification(destination.destinationDefinitionId);
   const destinationDefinition = useDestinationDefinition(destination.destinationDefinitionId);
   const { mutateAsync: updateDestination } = useUpdateDestination();