diff --git a/apachesolr_search.admin.inc b/apachesolr_search.admin.inc
index 0f9abb7..4314fa9 100644
--- a/apachesolr_search.admin.inc
+++ b/apachesolr_search.admin.inc
@@ -320,7 +320,7 @@ function apachesolr_search_page_settings_form($form, &$form_state, $search_page
   $form['info']['custom_filter_enable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Custom Filter'),
-    '#default_value' => !empty($search_page->settings['fq'])  ? TRUE : FALSE
+    '#default_value' => !empty($search_page->settings['apachesolr_search_custom_enable'])  ? TRUE : FALSE
   );
 
   $form['info']['filters'] = array(
@@ -477,6 +477,7 @@ function apachesolr_search_page_settings_form_submit($form, &$form_state) {
       }
     }
   }
+  $settings['apachesolr_search_custom_enable'] = $form_state['values']['custom_filter_enable'];
   $settings['apachesolr_search_search_type'] = $form_state['values']['search_type'];
   $settings['apachesolr_search_search_box'] = $form_state['values']['apachesolr_search_search_box'];
   $settings['apachesolr_search_per_page'] = $form_state['values']['apachesolr_search_per_page'];
diff --git a/apachesolr_search.module b/apachesolr_search.module
index 86f8731..eaac4c9 100644
--- a/apachesolr_search.module
+++ b/apachesolr_search.module
@@ -832,6 +832,7 @@ function apachesolr_search_conditions_default($search_page) {
   $search_type = isset($search_page->settings['apachesolr_search_search_type']) ? $search_page->settings['apachesolr_search_search_type'] : '';
   $allow_user_input = isset($search_page->settings['apachesolr_search_allow_user_input']) ? $search_page->settings['apachesolr_search_allow_user_input'] : FALSE;
   $path_replacer = isset($search_page->settings['apachesolr_search_path_replacer']) ? $search_page->settings['apachesolr_search_path_replacer'] : '';
+  $set_custom_filter = isset($search_page->settings['apachesolr_search_custom_enable']) ? $search_page->settings['apachesolr_search_custom_enable'] : '';
   $search_page_fq = !empty($search_page->settings['fq']) ? $search_page->settings['fq'] : '';
 
   $conditions['fq'] = array();
@@ -853,7 +854,7 @@ function apachesolr_search_conditions_default($search_page) {
   }
 
   // Custom filters added in search pages
-  if (!empty($search_page_fq)) {
+  if (!empty($search_page_fq) && !empty($set_custom_filter)) {
     if (!empty($path_replacer)) {
       // If the manual filter has a % in it, replace it with $value
       $conditions['fq'][] = str_replace('%', $path_replacer, $search_page_fq);