diff --git a/packages/metal-state/src/State.js b/packages/metal-state/src/State.js
index 2ab940e6..70fe0476 100644
--- a/packages/metal-state/src/State.js
+++ b/packages/metal-state/src/State.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import { async, getStaticProperty, isDefAndNotNull, isFunction, isObject, isString, object } from 'metal';
+import { async, getStaticProperty, isDef, isDefAndNotNull, isFunction, isObject, isString, object } from 'metal';
 import { EventEmitter } from 'metal-events';
 
 /**
@@ -553,7 +553,7 @@ class State extends EventEmitter {
 	 * @protected
 	 */
 	setInitialValue_(name) {
-		if (this.hasInitialValue_(name)) {
+		if (this.hasInitialValue_(name) && isDef(this.initialValues_[name])) {
 			this.set(name, this.initialValues_[name]);
 			this.initialValues_[name] = undefined;
 		}