diff --git a/src/routes/(picsure)/(authorized)/explorer/genome-filter/+page.svelte b/src/routes/(picsure)/(authorized)/explorer/genome-filter/+page.svelte
index 311468bd..583691c6 100644
--- a/src/routes/(picsure)/(authorized)/explorer/genome-filter/+page.svelte
+++ b/src/routes/(picsure)/(authorized)/explorer/genome-filter/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte';
 
-  import { branding } from '$lib/configuration';
+  import { branding, features } from '$lib/configuration';
 
   import { goto } from '$app/navigation';
   import { page } from '$app/stores';
@@ -30,7 +30,11 @@
   import { addFilter, getFiltersByType } from '$lib/stores/Filter';
 
   let edit = $page.url.searchParams.get('edit') || '';
-  let selectedOption: Option = ['snp', 'genomic'].includes(edit) ? (edit as Option) : Option.None;
+  let selectedOption: Option = (() => {
+    if (features.enableGENEQuery && !features.enableSNPQuery) return Option.Genomic;
+    if (!features.enableGENEQuery && features.enableSNPQuery) return Option.SNP;
+    return ['snp', 'genomic'].includes(edit) ? (edit as Option) : Option.None;
+  })();
 
   function clearFilters() {
     clearGeneFilters();
@@ -80,10 +84,10 @@
   backTitle="Back to Explore"
   transition={true}
 >
-  {#if selectedOption === Option.None}
-    <FilterType class="my-4" on:select={onSelectFilterType} active={selectedOption} />
-  {:else}
+  {#if features.enableGENEQuery && features.enableSNPQuery}
     <FilterType class="my-4" on:select={onSelectFilterType} active={selectedOption} />
+  {/if}
+  {#if selectedOption !== Option.None}
     {#if selectedOption === Option.Genomic}
       <GeneSearch class="mb-0 mt-6" />
     {:else}