diff --git a/packages/api/src/routes/avs/avsController.ts b/packages/api/src/routes/avs/avsController.ts
index b87a289a..7cd1fe31 100644
--- a/packages/api/src/routes/avs/avsController.ts
+++ b/packages/api/src/routes/avs/avsController.ts
@@ -376,9 +376,12 @@ export async function getAVS(req: Request, res: Response) {
 			}
 		})
 
-		const shares = withOperatorShares(avs.operators).filter((s) => true)
 		// TODO: Add back with operator set strategies
-		// (s) => avs.restakeableStrategies.indexOf(s.strategyAddress.toLowerCase()) !== -1
+		// TODO: Select whether to use operator set strategies or all strategies
+		// const shares = withOperatorShares(avs.operators).filter((s) => true)
+		const shares = withOperatorShares(avs.operators).filter(
+			(s) => avs.restakeableStrategies.indexOf(s.strategyAddress.toLowerCase()) !== -1
+		)
 
 		const strategiesWithSharesUnderlying = withTvl ? await getStrategiesWithShareUnderlying() : []
 
diff --git a/packages/api/src/utils/operatorShares.ts b/packages/api/src/utils/operatorShares.ts
index d2cc7b24..ba92c839 100644
--- a/packages/api/src/utils/operatorShares.ts
+++ b/packages/api/src/utils/operatorShares.ts
@@ -6,10 +6,11 @@ export function withOperatorShares(avsOperators) {
 	const sharesMap: IMap<string, string> = new Map()
 
 	avsOperators.map((avsOperator) => {
+		// TODO: Add back with operator set strategies
+		// TODO: Select whether to use operator set strategies or all strategies
+		// const shares = avsOperator.operator.shares.filter((s) => true)
 		const shares = avsOperator.operator.shares.filter(
-			(s) => true
-			// TODO: Add back with operator set strategies
-			// avsOperator.restakedStrategies.indexOf(s.strategyAddress.toLowerCase()) !== -1
+			(s) => avsOperator.restakedStrategies.indexOf(s.strategyAddress.toLowerCase()) !== -1
 		)
 
 		shares.map((s) => {
diff --git a/packages/seeder/src/monitors/avsMetrics.ts b/packages/seeder/src/monitors/avsMetrics.ts
index 839eda59..1d375902 100644
--- a/packages/seeder/src/monitors/avsMetrics.ts
+++ b/packages/seeder/src/monitors/avsMetrics.ts
@@ -67,15 +67,16 @@ export async function monitorAvsMetrics(params: MonitorAvsMetricsParams) {
 					where: {
 						operatorAddress: {
 							in: avs.operators.map((o) => o.operatorAddress)
-						},
-						shares: {
-							some: {
-								strategyAddress: {
-									in: avs.restakeableStrategies
-								},
-								shares: { gt: '0' }
-							}
 						}
+						// TODO: Add back with operator set strategies
+						// shares: {
+						// 	some: {
+						// 		strategyAddress: {
+						// 			in: avs.restakeableStrategies
+						// 		},
+						// 		shares: { gt: '0' }
+						// 	}
+						// }
 					}
 				})