diff --git a/package.json b/package.json
index 750a1df..ef22318 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "uiuiui",
-	"version": "0.5.17",
+	"version": "0.5.18",
 	"main": "dist/uiuiui.cjs.js",
 	"module": "dist/uiuiui.js",
 	"source": "src/index.js",
diff --git a/src/Input/NumericInput.js b/src/Input/NumericInput.js
index 121880b..481304f 100644
--- a/src/Input/NumericInput.js
+++ b/src/Input/NumericInput.js
@@ -38,8 +38,9 @@ class NumericInput extends React.PureComponent {
 		}
 	}
 
+	// Don't format user input if it's not defined (so we don't end up with NaN)
 	format_user_input(value) {
-		return this.format_value(parseFloat(value));
+		return value ? this.format_value(parseFloat(value)) : value;
 	}
 
 	format_value(value, method = clamp) {
diff --git a/src/Input/stories/index.stories.js b/src/Input/stories/index.stories.js
index 6c11e67..7b8bd92 100644
--- a/src/Input/stories/index.stories.js
+++ b/src/Input/stories/index.stories.js
@@ -52,6 +52,25 @@ storiesOf('Input', module)
 			</Husk>
 		);
 	})
+	.add('NumericInput, Controller, Set to undefined', () => {
+		return (
+			<Husk useState={{ value: 50 }}>
+				{(state, setState) => (
+					<React.Fragment>
+						<NumericInput value={state.value} onChange={value => setState({ value })} />
+
+						<button
+							onClick={() => {
+								setState({ value: undefined });
+							}}
+						>
+							set to undefined
+						</button>
+					</React.Fragment>
+				)}
+			</Husk>
+		);
+	})
 	.add('ColorInput', () => {
 		return (
 			<ColorInput value="tomato" current={value => <Swatch color={value} />}>