diff --git a/airbyte-webapp/src/components/connection/CatalogTree/CatalogTree.tsx b/airbyte-webapp/src/components/connection/CatalogTree/CatalogTree.tsx
index ad8340e0745a9e..afc667ba0a7c1b 100644
--- a/airbyte-webapp/src/components/connection/CatalogTree/CatalogTree.tsx
+++ b/airbyte-webapp/src/components/connection/CatalogTree/CatalogTree.tsx
@@ -56,8 +56,13 @@ const CatalogTreeComponent: React.FC<React.PropsWithChildren<CatalogTreeProps>>
 
   const changedStreams = useMemo(
     () =>
-      streams.filter((stream, idx) => {
-        return stream.config?.selected !== initialValues.syncCatalog.streams[idx].config?.selected;
+      streams.filter((stream) => {
+        const matchingInitialValue = initialValues.syncCatalog.streams.find(
+          (initialStream) =>
+            initialStream.stream?.name === stream.stream?.name &&
+            initialStream.stream?.namespace === stream.stream?.namespace
+        );
+        return stream.config?.selected !== matchingInitialValue?.config?.selected;
       }),
     [initialValues.syncCatalog.streams, streams]
   );