diff --git a/src/components/ha-selector/ha-selector-number.ts b/src/components/ha-selector/ha-selector-number.ts
index fbc6796a6a..fd66d3efe7 100644
--- a/src/components/ha-selector/ha-selector-number.ts
+++ b/src/components/ha-selector/ha-selector-number.ts
@@ -40,7 +40,9 @@ export class HaNumberSelector extends LitElement {
                 .min=${this.selector.number?.min}
                 .max=${this.selector.number?.max}
                 .value=${this.value ?? ""}
-                .step=${this.selector.number?.step ?? 1}
+                .step=${this.selector.number?.step === "any"
+                  ? undefined
+                  : this.selector.number?.step ?? 1}
                 .disabled=${this.disabled}
                 .required=${this.required}
                 pin
@@ -51,7 +53,8 @@ export class HaNumberSelector extends LitElement {
             `
           : ""}
         <ha-textfield
-          .inputMode=${(this.selector.number?.step || 1) % 1 !== 0
+          .inputMode=${this.selector.number?.step === "any" ||
+          (this.selector.number?.step ?? 1) % 1 !== 0
             ? "decimal"
             : "numeric"}
           .label=${this.selector.number?.mode !== "box"
diff --git a/src/data/selector.ts b/src/data/selector.ts
index fcfa1ac983..0705e301df 100644
--- a/src/data/selector.ts
+++ b/src/data/selector.ts
@@ -256,7 +256,7 @@ export interface NumberSelector {
   number: {
     min?: number;
     max?: number;
-    step?: number;
+    step?: number | "any";
     mode?: "box" | "slider";
     unit_of_measurement?: string;
   } | null;