diff --git a/src/components/query/QueryCatalogs.js b/src/components/query/QueryCatalogs.js
index f341c216502d51dceecf1f9e104d4316e20ead0e..a127a5f27b1a800d514c1073c2cdc3a335efd0ae 100644
--- a/src/components/query/QueryCatalogs.js
+++ b/src/components/query/QueryCatalogs.js
@@ -44,6 +44,8 @@ export default function QueryCatalogs() {
     }
     return () => {
       console.log("cleaned up");
+      queryMap.clear();
+      setFormData();
       setConfigName(defaultConf);
     };
   }, [uri]);