diff --git a/packages/core/services/cluster/src/ops/datacenter/topology_get/mod.rs b/packages/core/services/cluster/src/ops/datacenter/topology_get/mod.rs
index b4b0b21394..78c085a9d3 100644
--- a/packages/core/services/cluster/src/ops/datacenter/topology_get/mod.rs
+++ b/packages/core/services/cluster/src/ops/datacenter/topology_get/mod.rs
@@ -118,8 +118,7 @@ pub async fn cluster_datacenter_topology_get(
 		FROM db_cluster.servers
 		WHERE
 			datacenter_id = ANY($1) AND
-			cloud_destroy_ts IS NULL AND
-			taint_ts IS NULL
+			cloud_destroy_ts IS NULL
 		",
 		&input.datacenter_ids,
 	)
diff --git a/packages/core/services/cluster/src/ops/datacenter/topology_get/pegboard.rs b/packages/core/services/cluster/src/ops/datacenter/topology_get/pegboard.rs
index c1cf574d4b..109e7e4fb8 100644
--- a/packages/core/services/cluster/src/ops/datacenter/topology_get/pegboard.rs
+++ b/packages/core/services/cluster/src/ops/datacenter/topology_get/pegboard.rs
@@ -37,24 +37,14 @@ pub async fn pegboard_client_usage_get(ctx: &OperationCtx, input: &Input) -> Glo
 			r#"
 			label_replace(
 				sum by (client_id) (
-					last_over_time(
-						rivet_pegboard_client_cpu_allocated{{
-							client_id=~"({client_ids})",
-						}}
-						[15m:15s]
-					)
+					rivet_pegboard_client_cpu_allocated{{client_id=~"({client_ids})"}}
 				),
 				"metric", "cpu", "", ""
 			)
 			OR
 			label_replace(
 				sum by (client_id) (
-					last_over_time(
-						rivet_pegboard_client_memory_allocated{{
-							client_id=~"({client_ids})",
-						}}
-						[15m:15s]
-					)
+					rivet_pegboard_client_memory_allocated{{client_id=~"({client_ids})"}}
 				),
 				"metric", "mem", "", ""
 			)