diff --git a/src/dialogs/more-info/controls/more-info-vacuum.ts b/src/dialogs/more-info/controls/more-info-vacuum.ts
index c470b33cba..d1ca0ae75c 100644
--- a/src/dialogs/more-info/controls/more-info-vacuum.ts
+++ b/src/dialogs/more-info/controls/more-info-vacuum.ts
@@ -43,9 +43,11 @@ const VACUUM_COMMANDS: VacuumCommand[] = [
     icon: mdiPause,
     serviceName: "pause",
     isVisible: (stateObj) =>
-      // We need also to check if Start is supported because if not we show play-pause
-      supportsFeature(stateObj, VacuumEntityFeature.START) &&
-      supportsFeature(stateObj, VacuumEntityFeature.PAUSE),
+      // We need also to check if Start is supported because if not we show start-pause
+      // Start-pause service is only available for old vacuum entities, new entities have the `STATE` feature
+      supportsFeature(stateObj, VacuumEntityFeature.PAUSE) &&
+      (supportsFeature(stateObj, VacuumEntityFeature.STATE) ||
+        supportsFeature(stateObj, VacuumEntityFeature.START)),
   },
   {
     translationKey: "start_pause",
@@ -53,6 +55,8 @@ const VACUUM_COMMANDS: VacuumCommand[] = [
     serviceName: "start_pause",
     isVisible: (stateObj) =>
       // If start is supported, we don't show this button
+      // This service is only available for old vacuum entities, new entities have the `STATE` feature
+      !supportsFeature(stateObj, VacuumEntityFeature.STATE) &&
       !supportsFeature(stateObj, VacuumEntityFeature.START) &&
       supportsFeature(stateObj, VacuumEntityFeature.PAUSE),
   },
diff --git a/src/panels/lovelace/tile-features/hui-vacuum-commands-tile-feature.ts b/src/panels/lovelace/tile-features/hui-vacuum-commands-tile-feature.ts
index 3c4119511c..f4079030dd 100644
--- a/src/panels/lovelace/tile-features/hui-vacuum-commands-tile-feature.ts
+++ b/src/panels/lovelace/tile-features/hui-vacuum-commands-tile-feature.ts
@@ -63,6 +63,8 @@ export const VACUUM_COMMANDS_BUTTONS: Record<
 > = {
   start_pause: (stateObj) => {
     const startPauseOnly =
+      // This service is only available for old vacuum entities, new entities have the `STATE` feature
+      !supportsFeature(stateObj, VacuumEntityFeature.STATE) &&
       !supportsFeature(stateObj, VacuumEntityFeature.START) &&
       supportsFeature(stateObj, VacuumEntityFeature.PAUSE);