diff --git a/src/components/ha-form.js b/src/components/ha-form.js
index 71f4c0cdbe..77da7ad451 100644
--- a/src/components/ha-form.js
+++ b/src/components/ha-form.js
@@ -168,7 +168,11 @@ class HaForm extends EventsMixin(PolymerElement) {
   }
 
   _valueChanged(ev) {
-    this.set(["data", ev.model.item.name], ev.detail.value);
+    let value = ev.detail.value;
+    if (ev.model.item.type === "integer") {
+      value = Number(ev.detail.value);
+    }
+    this.set(["data", ev.model.item.name], value);
   }
 
   _passwordFieldType(unmaskedPassword) {