diff --git a/frontend/pages/queries/QueryPage/QueryPage.jsx b/frontend/pages/queries/QueryPage/QueryPage.jsx
index ff83867da5..469cf176ca 100644
--- a/frontend/pages/queries/QueryPage/QueryPage.jsx
+++ b/frontend/pages/queries/QueryPage/QueryPage.jsx
@@ -201,10 +201,10 @@ class QueryPage extends Component {
     dispatch(setSelectedTargetsQuery(query));
 
     const hosts = flatMap(selectedTargets, (target) => {
-      return target.target_type === 'hosts' ? target.id : null;
+      return target.target_type === 'hosts' ? [target.id] : [];
     });
     const labels = flatMap(selectedTargets, (target) => {
-      return target.target_type === 'labels' ? target.id : null;
+      return target.target_type === 'labels' ? [target.id] : [];
     });
     const selected = { hosts, labels };