diff --git a/.eslintrc b/.eslintrc
index 2db2e0a..57d4799 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,3 +1,6 @@
 {
-  "extends": "./node_modules/react-component-template/.eslintrc"
+  "extends": "./node_modules/react-component-template/.eslintrc",
+  "rules": {
+    "no-empty-function": 0
+  }
 }
diff --git a/src/Component.js b/src/Component.js
index 2b83aa8..e0e7502 100644
--- a/src/Component.js
+++ b/src/Component.js
@@ -3,11 +3,14 @@ import debounce from 'lodash.debounce';
 import {shouldComponentUpdate} from 'react/lib/ReactComponentWithPureRenderMixin';
 
 
+const noop = () => {};
+
+
 export const DebounceInput = React.createClass({
   propTypes: {
     element: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.func]),
     type: React.PropTypes.string,
-    onChange: React.PropTypes.func.isRequired,
+    onChange: React.PropTypes.func,
     onKeyDown: React.PropTypes.func,
     onBlur: React.PropTypes.func,
     value: React.PropTypes.oneOfType([
@@ -66,8 +69,8 @@ export const DebounceInput = React.createClass({
 
 
   createNotifier(debounceTimeout) {
-    if (debounceTimeout < 0) {
-      this.notify = () => null;
+    if (debounceTimeout < 0 || !this.props.hasOwnProperty('onChange')) {
+      this.notify = noop;
     } else if (debounceTimeout === 0) {
       this.notify = this.props.onChange;
     } else {
@@ -77,6 +80,10 @@ export const DebounceInput = React.createClass({
 
 
   forceNotify(event) {
+    if (!this.props.hasOwnProperty('onChange')) {
+      return;
+    }
+
     if (this.notify.cancel) {
       this.notify.cancel();
     }
@@ -95,21 +102,43 @@ export const DebounceInput = React.createClass({
   onChange(event) {
     event.persist();
 
-    const oldValue = this.state.value;
+    this.oldValue = this.state.value;
+    this.setState({value: event.target.value}, this.afterSetState);
+  },
+
 
-    this.setState({value: event.target.value}, () => {
-      const {value} = this.state;
+  afterSetState() {
+    const {value} = this.state;
 
-      if (value.length >= this.props.minLength) {
-        this.notify(event);
-        return;
-      }
+    if (value.length >= this.props.minLength) {
+      this.notify(event);
+      return;
+    }
 
-      // If user hits backspace and goes below minLength consider it cleaning the value
-      if (oldValue.length > value.length) {
-        this.notify({...event, target: {...event.target, value: ''}});
-      }
-    });
+    // If user hits backspace and goes below minLength consider it cleaning the value
+    if (this.oldValue.length > value.length) {
+      this.notify({...event, target: {...event.target, value: ''}});
+    }
+  },
+
+
+  onKeyDown(event) {
+    if (event.key === 'Enter') {
+      this.forceNotify(event);
+    }
+    // Invoke original onKeyDown if present
+    if (this.props.hasOwnProperty('onKeyDown')) {
+      this.props.onKeyDown(event);
+    }
+  },
+
+
+  onBlur(event) {
+    this.forceNotify(event);
+    // Invoke original onBlur if present
+    if (this.props.hasOwnProperty('onBlur')) {
+      this.props.onBlur(event);
+    }
   },
 
 
@@ -125,35 +154,17 @@ export const DebounceInput = React.createClass({
       ...props
     } = this.props;
 
-    const onKeyDown = forceNotifyByEnter ? {
-      onKeyDown: event => {
-        if (event.key === 'Enter') {
-          this.forceNotify(event);
-        }
-        // Invoke original onKeyDown if present
-        if (this.props.onKeyDown) {
-          this.props.onKeyDown(event);
-        }
-      }
-    } : {};
-
-    const onBlur = forceNotifyOnBlur ? {
-      onBlur: event => {
-        this.forceNotify(event);
-        // Invoke original onBlur if present
-        if (this.props.onBlur) {
-          this.props.onBlur(event);
-        }
-      }
-    } : {};
-
+    const onChangeProp = this.props.hasOwnProperty('onChange') ? {onChange: this.onChange} : {};
+    const valueProp = this.props.hasOwnProperty('onChange') ? {value: this.state.value} : {};
+    const onKeyDownProp = forceNotifyByEnter ? {onKeyDown: this.onKeyDown} : {};
+    const onBlurProp = forceNotifyOnBlur ? {onBlur: this.onBlur} : {};
 
     return React.createElement(element, {
       ...props,
-      onChange: this.onChange,
-      value: this.state.value,
-      ...onKeyDown,
-      ...onBlur
+      ...valueProp,
+      ...onChangeProp,
+      ...onKeyDownProp,
+      ...onBlurProp
     });
   }
 });
diff --git a/src/example/App/Uncontrolled.js b/src/example/App/Uncontrolled.js
new file mode 100644
index 0000000..c93132d
--- /dev/null
+++ b/src/example/App/Uncontrolled.js
@@ -0,0 +1,49 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import DebounceInput from '../..';
+import css from './App.css';
+
+
+const Uncontrolled = React.createClass({
+  getInitialState() {
+    return {
+      value: '',
+      key: ''
+    };
+  },
+
+
+  onRef(ref) {
+    this.ref = ReactDom.findDOMNode(ref);
+  },
+
+
+  onKeyDown({key}) {
+    if (key === 'Enter') {
+      this.setState({key, value: this.ref.value})
+    } else {
+      this.setState({key})
+    }
+  },
+
+
+  render() {
+    const {
+      value, key
+    } = this.state;
+
+    return (
+      <div>
+        <DebounceInput
+          ref={this.onRef}
+          onKeyDown={this.onKeyDown} />
+        <p>Value: {value}</p>
+        <p>Key pressed: {key}</p>
+      </div>
+
+    );
+  }
+});
+
+
+export default Uncontrolled;
diff --git a/src/example/App/index.js b/src/example/App/index.js
index 09a62aa..62d7d5f 100644
--- a/src/example/App/index.js
+++ b/src/example/App/index.js
@@ -3,6 +3,7 @@ import Controllable from './Controllable';
 import Customizable from './Customizable';
 import UndoRedo from './UndoRedo';
 import Textarea from './Textarea';
+import Uncontrolled from './Uncontrolled';
 import css from './App.css';
 
 
@@ -28,6 +29,11 @@ const App = () => (
       <h2>Example 4. Debounced Textarea</h2>
       <Textarea />
     </section>
+
+    <section className={css.section}>
+      <h2>Example 5. Uncontrolled input</h2>
+      <Uncontrolled />
+    </section>
   </div>
 );