diff --git a/frontend/src/_stores/dataQueriesStore.js b/frontend/src/_stores/dataQueriesStore.js
index d905cee09a..cc4f602b78 100644
--- a/frontend/src/_stores/dataQueriesStore.js
+++ b/frontend/src/_stores/dataQueriesStore.js
@@ -101,6 +101,7 @@ export const useDataQueriesStore = create(
           set({ dataQueries });
           if (type === 'mappingUpdate') {
             const { actions } = useQueryPanelStore.getState();
+            actions.setSelectedQuery(null);
             const queryId = dataQueries[0]?.id;
 
             actions.setSelectedQuery(queryId);