diff --git a/packages/app/src/DBSearchPage.tsx b/packages/app/src/DBSearchPage.tsx
index 1f07d5622..049b0ada2 100644
--- a/packages/app/src/DBSearchPage.tsx
+++ b/packages/app/src/DBSearchPage.tsx
@@ -881,7 +881,7 @@ function DBSearchPage() {
     values: {
       select: searchedConfig.select || '',
       where: searchedConfig.where || '',
-      whereLanguage: searchedConfig.whereLanguage ?? 'lucene',
+      whereLanguage: searchedConfig.whereLanguage ?? (localStorage.getItem('hdx-search-language-preference') as 'sql' | 'lucene') ?? 'lucene',
       source: searchedConfig.source || defaultSourceId,
       filters: searchedConfig.filters ?? [],
       orderBy: searchedConfig.orderBy ?? '',
@@ -944,7 +944,7 @@ function DBSearchPage() {
       reset({
         select: searchedConfig?.select ?? '',
         where: searchedConfig?.where ?? '',
-        whereLanguage: searchedConfig?.whereLanguage ?? 'lucene',
+        
         source: searchedConfig?.source ?? undefined,
         filters: searchedConfig?.filters ?? [],
         orderBy: searchedConfig?.orderBy ?? '',
@@ -982,7 +982,7 @@ function DBSearchPage() {
         source: defaultSourceId,
         where: '',
         select: '',
-        whereLanguage: 'lucene',
+        whereLanguage: (localStorage.getItem('hdx-search-language-preference') as 'sql' | 'lucene') || 'lucene',
         filters: [],
         orderBy: '',
       });
@@ -996,7 +996,6 @@ function DBSearchPage() {
     defaultSourceId,
     sources,
   ]);
-
   const [_queryErrors, setQueryErrors] = useState<{
     [key: string]: Error | ClickHouseQueryError;
   }>({});
@@ -1545,10 +1544,13 @@ function DBSearchPage() {
   );
 
   const onLanguageChange = useCallback(
-    (lang: 'sql' | 'lucene') =>
+    (lang: 'sql' | 'lucene') => {
+      localStorage.setItem('hdx-search-language-preference',lang);
       setValue('whereLanguage', lang, {
         shouldDirty: true,
-      }),
+      });
+      
+    },
     [setValue],
   );