diff --git a/docs/components/demos/MultiSelect.jsx b/docs/components/demos/MultiSelect.jsx
index 9590230b3..fc5da7380 100644
--- a/docs/components/demos/MultiSelect.jsx
+++ b/docs/components/demos/MultiSelect.jsx
@@ -112,7 +112,7 @@ module.exports = React.createClass({
               <label className='form-label'>Disable Multiselect Values</label>
               <RW.Multiselect
                   value={ Array.isArray(this.state.disabled) ? this.state.disabled : [] }
-                  data={allVals}
+                  data={list}
                   textField='name'
                   valueField='id'
                   disabled={this.state.disabled === true}
diff --git a/src/Multiselect.jsx b/src/Multiselect.jsx
index c6ede6f53..a7c603287 100644
--- a/src/Multiselect.jsx
+++ b/src/Multiselect.jsx
@@ -268,8 +268,8 @@ var Multiselect = React.createClass({
               <List ref="list"
                 key={0}
                 {...listProps}
-                readOnly={!!readOnly}
-                disabled={!!disabled}
+                readOnly={readOnly}
+                disabled={disabled}
                 id={listID}
                 aria-live='polite'
                 aria-labelledby={instanceId(this)}