diff --git a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
index 3e6e35d811..f121702357 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
@@ -18,7 +18,6 @@ import {
   IHost,
   IDeviceMappingResponse,
   IMacadminsResponse,
-  IPackStats,
   IHostResponse,
   IHostMdmData,
   IPackStats,
@@ -33,7 +32,6 @@ import {
   IQueryKeyQueriesLoadAll,
   ISchedulableQuery,
 } from "interfaces/schedulable_query";
-import { IQueryStats } from "interfaces/query_stats";
 
 import Spinner from "components/Spinner";
 import TabsWrapper from "components/TabsWrapper";
diff --git a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
index 58e124b908..348952b6b9 100644
--- a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
@@ -353,14 +353,14 @@ const ManageQueriesPage = ({
       );
 
       // Update query automations using queries/{id} manage_automations parameter
-      const updateAutomatedQueries = [];
-      updateAutomatedQueries.push(
-        turnOnAutomations.map((id: number) =>
+      const updateAutomatedQueries: Promise<any>[] = [];
+      turnOnAutomations.map((id: number) =>
+        updateAutomatedQueries.push(
           queriesAPI.update(id, { automations_enabled: true })
         )
       );
-      updateAutomatedQueries.push(
-        turnOffAutomations.map((id: number) =>
+      turnOffAutomations.map((id: number) =>
+        updateAutomatedQueries.push(
           queriesAPI.update(id, { automations_enabled: false })
         )
       );
diff --git a/server/datastore/mysql/queries.go b/server/datastore/mysql/queries.go
index f757d2f442..1ea22ef2bf 100644
--- a/server/datastore/mysql/queries.go
+++ b/server/datastore/mysql/queries.go
@@ -388,7 +388,7 @@ func (ds *Datastore) ListQueries(ctx context.Context, opt fleet.ListQueryOptions
 	sql = appendListOptionsToSQL(sql, &opt.ListOptions)
 
 	results := []*fleet.Query{}
-	if err := sqlx.SelectContext(ctx, ds.writer(ctx), &results, sql, args...); err != nil {
+	if err := sqlx.SelectContext(ctx, ds.reader(ctx), &results, sql, args...); err != nil {
 		return nil, ctxerr.Wrap(ctx, err, "listing queries")
 	}
 
@@ -434,7 +434,7 @@ func (ds *Datastore) loadPacksForQueries(ctx context.Context, queries []*fleet.Q
 		fleet.Pack
 	}{}
 
-	err = sqlx.SelectContext(ctx, ds.writer(ctx), &rows, query, args...)
+	err = sqlx.SelectContext(ctx, ds.reader(ctx), &rows, query, args...)
 	if err != nil {
 		return ctxerr.Wrap(ctx, err, "selecting load packs for queries")
 	}