diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7fda240b7051a..8f94e50ddc861 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -718,6 +718,11 @@ static PHP_INI_MH(OnUpdate_mbstring_detect_order)
 	}
 	MBSTRG(detect_order_list) = list;
 	MBSTRG(detect_order_list_size) = size;
+
+	if (stage == PHP_INI_STAGE_RUNTIME) {
+		php_mb_populate_current_detect_order_list();
+	}
+
 	return SUCCESS;
 }
 /* }}} */
@@ -5981,6 +5986,11 @@ static void php_mb_populate_current_detect_order_list(void)
 			entry[i] = mbfl_no2encoding(src[i]);
 		}
 	}
+
+	if (MBSTRG(current_detect_order_list) != NULL) {
+		efree(ZEND_VOIDP(MBSTRG(current_detect_order_list)));
+	}
+
 	MBSTRG(current_detect_order_list) = entry;
 	MBSTRG(current_detect_order_list_size) = nentries;
 }
diff --git a/ext/mbstring/tests/mb_detect_order_with_ini_set.phpt b/ext/mbstring/tests/mb_detect_order_with_ini_set.phpt
new file mode 100644
index 0000000000000..ba59f3388b85e
--- /dev/null
+++ b/ext/mbstring/tests/mb_detect_order_with_ini_set.phpt
@@ -0,0 +1,60 @@
+--TEST--
+Test mb_detect_order() function : ini set changes order
+--EXTENSIONS--
+mbstring
+--INI--
+mbstring.detect_order=UTF-8,ISO-8859-15,ISO-8859-1,ASCII
+--FILE--
+<?php
+
+var_dump( mb_detect_order());
+
+ini_set('mbstring.detect_order', 'UTF-8, ISO-8859-1, ASCII');
+
+var_dump( mb_detect_order());
+
+ini_set('mbstring.detect_order', 'UTF-8');
+
+var_dump( mb_detect_order());
+
+ini_set('mbstring.detect_order', NULL);
+
+var_dump( mb_detect_order());
+
+ini_set('mbstring.detect_order', '');
+
+var_dump( mb_detect_order());
+
+?>
+--EXPECT--
+array(4) {
+  [0]=>
+  string(5) "UTF-8"
+  [1]=>
+  string(11) "ISO-8859-15"
+  [2]=>
+  string(10) "ISO-8859-1"
+  [3]=>
+  string(5) "ASCII"
+}
+array(3) {
+  [0]=>
+  string(5) "UTF-8"
+  [1]=>
+  string(10) "ISO-8859-1"
+  [2]=>
+  string(5) "ASCII"
+}
+array(1) {
+  [0]=>
+  string(5) "UTF-8"
+}
+array(1) {
+  [0]=>
+  string(5) "UTF-8"
+}
+array(1) {
+  [0]=>
+  string(5) "UTF-8"
+}
+