diff --git a/app/pages/catalog/index.vue b/app/pages/catalog/index.vue
index c15ced1..a2da8f8 100644
--- a/app/pages/catalog/index.vue
+++ b/app/pages/catalog/index.vue
@@ -3,8 +3,8 @@
     <CatalogPage
       ref="catalogPageRef"
       :loading="isLoading"
-      :use-server-clustering="true"
-      :use-typed-clusters="true"
+      :use-server-clustering="useServerClustering"
+      :use-typed-clusters="useServerClustering"
       :cluster-node-type="clusterNodeType"
       panel-width="w-[32rem]"
       map-id="unified-catalog-map"
@@ -497,6 +497,13 @@ const clusterProductUuid = computed(() => productId.value || undefined)
 const clusterHubUuid = computed(() => hubId.value || undefined)
 const clusterSupplierUuid = computed(() => supplierId.value || undefined)
 
+// When a product filter is active and we're viewing hubs, use the same list data on the map
+// to avoid mismatch between graph-filtered list and clustered map results.
+const useServerClustering = computed(() => {
+  if (productId.value && mapViewMode.value === 'hubs') return false
+  return true
+})
+
 // Show panel when selecting OR when showing info OR when showing quote results
 const showPanel = computed(() => {
   return selectMode.value !== null || infoId.value !== null || showQuoteResults.value