diff --git a/internal/praefect/datastore/collector.go b/internal/praefect/datastore/collector.go
index afb5974c1c26b826de6c36f4afcb76ab50cff035..a99f6514d6edde5264fcc96b7ea45d8b650630a9 100644
--- a/internal/praefect/datastore/collector.go
+++ b/internal/praefect/datastore/collector.go
@@ -80,11 +80,6 @@ func (c *RepositoryStoreCollector) Collect(ch chan<- prometheus.Metric) {
 // they are either unhealthy or out of date.
 func (c *RepositoryStoreCollector) queryMetrics(ctx context.Context) (map[string]int, error) {
 	rows, err := c.db.QueryContext(ctx, `
-WITH valid_primaries AS MATERIALIZED (
-	SELECT repository_id
-	FROM valid_primaries
-)
-
 SELECT virtual_storage, COUNT(*)
 FROM repositories
 WHERE NOT EXISTS (
diff --git a/internal/praefect/datastore/repository_store.go b/internal/praefect/datastore/repository_store.go
index cdacca0e886abaa34398ddfc41c550e3c3d00521..b9ee33ba35a8ad51c932c7bf18b194ad378f272d 100644
--- a/internal/praefect/datastore/repository_store.go
+++ b/internal/praefect/datastore/repository_store.go
@@ -670,10 +670,6 @@ func (rs *PostgresRepositoryStore) GetPartiallyAvailableRepositories(ctx context
 	//    than the assigned ones.
 	//
 	rows, err := rs.db.QueryContext(ctx, `
-WITH valid_primaries AS MATERIALIZED (
-	SELECT repository_id, storage FROM valid_primaries
-)
-
 SELECT
 	json_build_object (
 		'RelativePath', relative_path,
@@ -711,7 +707,7 @@ FROM (
 	) AS repository_assignments USING (repository_id, storage)
 	JOIN repositories USING (repository_id)
 	LEFT JOIN healthy_storages USING (virtual_storage, storage)
-	LEFT JOIN valid_primaries USING (repository_id, storage)
+	LEFT JOIN ( SELECT repository_id, storage FROM valid_primaries ) AS valid_primaries USING (repository_id, storage)
 	WHERE virtual_storage = $1
 	ORDER BY relative_path, "primary", storage
 ) AS outdated_repositories