diff --git a/src/Select.js b/src/Select.js
index a91e0de747..a21a7182ed 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -383,7 +383,7 @@ const Select = React.createClass({
 		if (this.state.inputValue !== event.target.value && this.props.onInputChange) {
 			let nextState = this.props.onInputChange(newInputValue);
 			// Note: != used deliberately here to catch undefined and null
-			if (nextState != null && typeof nextState !== 'object') {
+			if (nextState != null && typeof nextState !== 'object' && typeof nextState.then === 'undefined') {
 				newInputValue = '' + nextState;
 			}
 		}