diff --git a/includes/admin.inc b/includes/admin.inc
index 5ba7135..ef44338 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -4894,10 +4894,26 @@ function views_ui_admin_settings_basic() {
 
 //  $form['live_preview']['views_ui_show_performance_statistics_where'] = array(
 
+  $form['#submit'][] = 'views_ui_admin_settings_basic_submit';
+
   return system_settings_form($form);
 }
 
 /**
+ * Submit callback for views_ui_admin_settings_basic.
+ *
+ * This removes the export_ui data from the session if filtering is turned off.
+ */
+function views_ui_admin_settings_basic_submit($form, &$form_state) {
+  // Get the current option.
+  $current = variable_get('views_ui_show_listing_filters', FALSE);
+  // If the option is being turned off, remove the filter data from the session.
+  if ($current && empty($form_state['values']['views_ui_show_listing_filters'])) {
+    unset($_SESSION['ctools_export_ui']['views_ui']);
+  }
+}
+
+/**
  * Form builder for the advanced admin settings page.
  */
 function views_ui_admin_settings_advanced() {