diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index b4dae55102..b9b5837906 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -324,6 +324,7 @@ function add_option($name, $value = '', $description = '', $autoload = 'yes') {
 	}
 
 	$value = maybe_serialize($value);
+	$autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
 
 	if ( 'yes' == $autoload ) {
 		$alloptions = wp_load_alloptions();