diff --git a/src/components/presentational/SearchAndFilterInput.jsx b/src/components/presentational/SearchAndFilterInput.jsx
index 9f2a7dd6368970f6d7e77c46708c0a9c3ba7e5cd..828d2db5ddad4a99cb4758164b0d3854de5cc960 100644
--- a/src/components/presentational/SearchAndFilterInput.jsx
+++ b/src/components/presentational/SearchAndFilterInput.jsx
@@ -236,6 +236,11 @@ export default function SearchAndFilterInput(props) {
     return () => window.removeEventListener("message", onBoxDraw);
   }, []);
 
+  // If Available queriables are changed, reset the ones selected to none
+  useEffect(() => {
+    setSelectedOptions([]);
+  }, [props.availableQueriables]);
+
   // If target is changed, reset filter values;
   useEffect(() => {