diff --git a/core/Datastore/Key_Value_Datastore.php b/core/Datastore/Key_Value_Datastore.php
index ad64c6831..a35b2fd6e 100644
--- a/core/Datastore/Key_Value_Datastore.php
+++ b/core/Datastore/Key_Value_Datastore.php
@@ -174,7 +174,7 @@ abstract protected function save_key_value_pair( $key, $value );
 	public function save( Field $field ) {
 		$value_set = $field->get_full_value();
 
-		if ( empty( $value_set ) && $field->get_value_set()->keepalive() ) {
+		if ( empty( $value_set ) || $field->get_value_set()->keepalive() ) {
 			$storage_key = $this->key_toolset->get_storage_key(
 				$field->is_simple_root_field(),
 				$this->get_full_hierarchy_for_field( $field ),