diff --git a/.changeset/nervous-taxis-grin.md b/.changeset/nervous-taxis-grin.md
new file mode 100644
index 0000000000..5fb892baee
--- /dev/null
+++ b/.changeset/nervous-taxis-grin.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-tech-insights-backend': patch
+---
+
+Modify queries to perform better by filtering on subqueries as well
diff --git a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
index 31a2997af5..7cbf5671c2 100644
--- a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
+++ b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
@@ -112,6 +112,8 @@ export class TechInsightsDatabase implements TechInsightsStore {
         this.db('facts')
           .max('timestamp')
           .column('id as subId')
+          .where({ entity: entityTriplet })
+          .and.whereIn('id', ids)
           .groupBy('id')
           .as('subQ'),
         'facts.id',