diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index 3c3f513507..2719a70c25 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -1295,6 +1295,11 @@ export class HaConfigDevicePage extends LitElement {
               }
             }
           }
+        } else if (
+          updates.disabled_by !== null &&
+          updates.disabled_by !== "user"
+        ) {
+          delete updates.disabled_by;
         }
         try {
           await updateDeviceRegistryEntry(this.hass, this.deviceId, updates);