diff --git a/gui/src/components/input/QueryList.tsx b/gui/src/components/input/QueryList.tsx
index f4f75035..11e05c04 100644
--- a/gui/src/components/input/QueryList.tsx
+++ b/gui/src/components/input/QueryList.tsx
@@ -1,6 +1,7 @@
 import { doesExist, mustDefault, mustExist } from '@apextoaster/js-utils';
 import { Alert, FormControl, InputLabel, MenuItem, Select, Typography } from '@mui/material';
 import * as React from 'react';
+import { useEffect } from 'react';
 import { UseQueryResult } from 'react-query';
 
 export interface QueryListComplete {
@@ -48,6 +49,15 @@ export function QueryList<T>(props: QueryListProps<T>) {
     }
   }
 
+  useEffect(() => {
+    if (result.status === 'success' && doesExist(result.data) && doesExist(props.onChange)) {
+      const data = filterQuery(query);
+      if (data.includes(value) === false) {
+        props.onChange(data[0]);
+      }
+    }
+  }, [result.status]);
+
   if (result.status === 'error') {
     if (result.error instanceof Error) {
       return <Alert severity='error'>Error: {result.error.message}</Alert>;