diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 66edbd44ae..930c8d2a26 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -593,7 +593,7 @@ class acp_search
 
 		ksort($this->state);
 
-		set_config('search_indexing_state', implode(',', $this->state));
+		set_config('search_indexing_state', implode(',', $this->state), true);
 	}
 
 	/**
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 90c46be06b..e79ea717cf 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -896,6 +896,7 @@ function change_database_data(&$no_updates, $version)
 		// Changes from 3.0.4 to 3.0.5-dev
 		case '3.0.4':
 
+			// Captcha config variables
 			set_config('captcha_gd_wave', 0);
 			set_config('captcha_gd_3d_noise', 1);
 			set_config('captcha_gd_fonts', 1);
@@ -905,6 +906,12 @@ function change_database_data(&$no_updates, $version)
 			// Maximum number of keywords
 			set_config('max_num_search_keywords', 10);
 
+			// Remove static config var and put it back as dynamic variable
+			$sql = 'UPDATE ' . CONFIG_TABLE . "
+				SET is_dynamic = 1
+				WHERE config_name = 'search_indexing_state'";
+			_sql($sql, $errored, $error_ary);
+
 			// Hash old MD5 passwords
 			$sql = 'SELECT user_id, user_password
 					FROM ' . USERS_TABLE . '
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f5e7b2a4c1..759cfb1758 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -197,7 +197,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('referer_validation
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_block_size', '250');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_indexing_state', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_anonymous_interval', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'fulltext_native');
@@ -242,6 +241,7 @@ INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('rand_s
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('rand_seed_last_update', '0', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_date', '0', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_users', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('search_indexing_state', '', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('search_last_gc', '0', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('session_last_gc', '0', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('upload_dir_size', '0', 1);