diff --git a/src/components/ha-selector/ha-selector-number.ts b/src/components/ha-selector/ha-selector-number.ts
index 393dbb7d00..8f64b386bf 100644
--- a/src/components/ha-selector/ha-selector-number.ts
+++ b/src/components/ha-selector/ha-selector-number.ts
@@ -29,12 +29,12 @@ export class HaNumberSelector extends LitElement {
 
   protected render() {
     return html`${this.label}
-      ${this.selector.number.mode === "slider"
+      ${this.selector.number.mode !== "box"
         ? html`<ha-slider
             .min=${this.selector.number.min}
             .max=${this.selector.number.max}
             .value=${this._value}
-            .step=${this.selector.number.step}
+            .step=${this.selector.number.step ?? 1}
             .disabled=${this.disabled}
             pin
             ignore-bar-touch
@@ -44,16 +44,14 @@ export class HaNumberSelector extends LitElement {
         : ""}
       <paper-input
         pattern="[0-9]+([\\.][0-9]+)?"
-        .label=${this.selector.number.mode === "slider"
-          ? undefined
-          : this.label}
+        .label=${this.selector.number.mode !== "box" ? undefined : this.label}
         .placeholder=${this.placeholder}
-        .noLabelFloat=${this.selector.number.mode === "slider"}
+        .noLabelFloat=${this.selector.number.mode !== "box"}
         class=${classMap({ single: this.selector.number.mode === "box" })}
         .min=${this.selector.number.min}
         .max=${this.selector.number.max}
         .value=${this.value}
-        .step=${this.selector.number.step}
+        .step=${this.selector.number.step ?? 1}
         .disabled=${this.disabled}
         type="number"
         auto-validate
diff --git a/src/data/selector.ts b/src/data/selector.ts
index 7722d56de8..3bb2999877 100644
--- a/src/data/selector.ts
+++ b/src/data/selector.ts
@@ -72,8 +72,8 @@ export interface NumberSelector {
   number: {
     min: number;
     max: number;
-    step: number;
-    mode: "box" | "slider";
+    step?: number;
+    mode?: "box" | "slider";
     unit_of_measurement?: string;
   };
 }