diff --git a/src/browser/dom/components/ReactDOMSelect.js b/src/browser/dom/components/ReactDOMSelect.js
index 4e625aad8b..98243b6a3c 100644
--- a/src/browser/dom/components/ReactDOMSelect.js
+++ b/src/browser/dom/components/ReactDOMSelect.js
@@ -56,14 +56,15 @@ function selectValueType(props, propName, componentName) {
 
 /**
  * If `value` is supplied, updates <option> elements on mount and update.
+ * @param {ReactComponent} component Instance of ReactDOMSelect
+ * @param {?*} propValue For uncontrolled components, null/undefined. For
+ * controlled components, a string (or with `multiple`, a list of strings).
  * @private
  */
-function updateOptions() {
-  /*jshint validthis:true */
-  var multiple = this.props.multiple;
-  var propValue = LinkedValueUtils.getValue(this);
-  var value = propValue != null ? propValue : this.state.value;
-  var options = this.getDOMNode().options;
+function updateOptions(component, propValue) {
+  var multiple = component.props.multiple;
+  var value = propValue != null ? propValue : component.state.value;
+  var options = component.getDOMNode().options;
   var selectedValue, i, l;
   if (multiple) {
     selectedValue = {};
@@ -136,9 +137,16 @@ var ReactDOMSelect = ReactCompositeComponent.createClass({
     return select(props, this.props.children);
   },
 
-  componentDidMount: updateOptions,
+  componentDidMount: function() {
+    updateOptions(this, LinkedValueUtils.getValue(this));
+  },
 
-  componentDidUpdate: updateOptions,
+  componentDidUpdate: function() {
+    var value = LinkedValueUtils.getValue(this);
+    if (value != null) {
+      updateOptions(this, value);
+    }
+  },
 
   _handleChange: function(event) {
     var returnValue;
diff --git a/src/browser/dom/components/__tests__/ReactDOMSelect-test.js b/src/browser/dom/components/__tests__/ReactDOMSelect-test.js
index ee4c9746ec..1419122bbe 100644
--- a/src/browser/dom/components/__tests__/ReactDOMSelect-test.js
+++ b/src/browser/dom/components/__tests__/ReactDOMSelect-test.js
@@ -58,6 +58,23 @@ describe('ReactDOMSelect', function() {
     expect(node.value).toEqual('giraffe');
   });
 
+  it('should not control when using `defaultValue`', function() {
+    var stub =
+      <select defaultValue="giraffe">
+        <option value="monkey">A monkey!</option>
+        <option value="giraffe">A giraffe!</option>
+        <option value="gorilla">A gorilla!</option>
+      </select>;
+    var node = renderSelect(stub);
+
+    expect(node.value).toBe('giraffe');
+
+    node.value = 'monkey';
+    stub.forceUpdate();
+    // Uncontrolled selects shouldn't change the value after first mounting
+    expect(node.value).toEqual('monkey');
+  });
+
   it('should allow setting `defaultValue` with multiple', function() {
     var stub =
       <select multiple={true} defaultValue={['giraffe', 'gorilla']}>