diff --git a/inc/site-metabox.php b/inc/site-metabox.php
index 38db57c..2b04b7c 100644
--- a/inc/site-metabox.php
+++ b/inc/site-metabox.php
@@ -58,7 +58,7 @@ function render() {
 	$values = [];
 	foreach ( $flags as $flag ) {
 		/* @var \HumanMade\Flags\Flag $flag */
-		$values[ $flag->id ] = get_option( $flag->get_storage_key(), true, '' ) === 'active';
+		$values[ $flag->id ] = (bool) $flag->active;
 	}
 	?>
 	<table class="form-table">
diff --git a/inc/site.php b/inc/site.php
index f57aa87..16a11c1 100644
--- a/inc/site.php
+++ b/inc/site.php
@@ -40,7 +40,7 @@ function handle( Flag $flag ) {
 	}
 
 	// Get site preference, if any, to set current status of the flag.
-	$value = get_option( $flag->get_storage_key(), true, '' );
+	$value = get_option( $flag->get_storage_key(), '' );
 	if ( $value ) {
 		$flag->set( 'active', $value === 'active' );
 	}
@@ -58,5 +58,5 @@ function handle( Flag $flag ) {
  * @return bool|int
  */
 function save( bool $value, Flag $flag ) {
-	return update_option( $flag->get_storage_key(), $value );
+	return update_option( $flag->get_storage_key(), $value ? 'active' : 'inactive' );
 }