diff --git a/wysiwyg_filter.admin.inc b/wysiwyg_filter.admin.inc
index 38fb424..4fa4031 100644
--- a/wysiwyg_filter.admin.inc
+++ b/wysiwyg_filter.admin.inc
@@ -167,10 +167,13 @@ This option allows you to specify which HTML elements and attributes are allowed
  * add validate and submit handlers
  */
 function wysiwyg_filter_form_filter_admin_format_form_alter(&$form, &$form_state, $form_id) {
-  $form['#validate'][] = 'wysiwyg_filter_filter_wysiwyg_settings_validate';
-  // Add the submit callback to the beginning of the array because we need
-  // to prepare data for system_settings_form_submit().
-  array_unshift($form['#submit'], 'wysiwyg_filter_filter_wysiwyg_settings_submit');
+	$status =& $form_state['values']['filters']['wysiwyg']['status'];
+	if($status == 1){ // check that we're allowed to validate first
+		$form['#validate'][] = 'wysiwyg_filter_filter_wysiwyg_settings_validate';
+		// Add the submit callback to the beginning of the array because we need
+		// to prepare data for system_settings_form_submit().
+		array_unshift($form['#submit'], 'wysiwyg_filter_filter_wysiwyg_settings_submit');
+	}
 }
 
 /**
-- 
1.8.3.4 (Apple Git-47)