diff --git a/custom_components/moonraker/binary_sensor.py b/custom_components/moonraker/binary_sensor.py
index 20bec05..02d3411 100644
--- a/custom_components/moonraker/binary_sensor.py
+++ b/custom_components/moonraker/binary_sensor.py
@@ -70,6 +70,7 @@ async def async_setup_update_binary_sensors(coordinator, entry, async_add_entiti
         subscriptions=[("status", "update_available")],
         icon="mdi:update",
         device_class=BinarySensorDeviceClass.UPDATE,
+        entity_registry_enabled_default=False,
     )
 
     coordinator.load_sensor_data([desc])
diff --git a/custom_components/moonraker/sensor.py b/custom_components/moonraker/sensor.py
index 8cb231f..8d4372e 100755
--- a/custom_components/moonraker/sensor.py
+++ b/custom_components/moonraker/sensor.py
@@ -500,6 +500,7 @@ async def async_setup_machine_update_sensors(coordinator, entry, async_add_entit
             value_fn=lambda sensor: f"{sensor.coordinator.data['machine_update']['version_info']['system']['package_count']} packages can be upgraded",
             subscriptions=[],
             icon="mdi:update",
+            entity_registry_enabled_default=False,
         )
     ]
 
@@ -510,7 +511,7 @@ async def async_setup_machine_update_sensors(coordinator, entry, async_add_entit
         sensors.append(
             MoonrakerSensorDescription(
                 key=f"machine_update_{version_info}",
-                name=f"{version_info.title()}",
+                name=f"Version {version_info.title()}",
                 status_key=version_info,
                 value_fn=lambda sensor: (lambda v, rv: f"{v} > {rv}" if v != rv else v)(
                     sensor.coordinator.data["machine_update"]["version_info"][
@@ -522,6 +523,7 @@ async def async_setup_machine_update_sensors(coordinator, entry, async_add_entit
                 ),
                 subscriptions=[],
                 icon="mdi:update",
+                entity_registry_enabled_default=False,
             )
         )
     coordinator.load_sensor_data(sensors)