diff --git a/docs/src/references/mqtt-api.md b/docs/src/references/mqtt-api.md
index 5ceb3d40ade..dc047a8f6f5 100644
--- a/docs/src/references/mqtt-api.md
+++ b/docs/src/references/mqtt-api.md
@@ -384,10 +384,9 @@ te/device/rpi1001/service/collectd/m/cpu_usage
 `rpi1001` and `collectd` will be auto-registered as `device` and `service` types.
 
 :::caution
-Auto-registration of entities is turned OFF by default.
-as users are highly encouraged to do explicit registration for their devices
-unless auto registration is absolutely necessary.
-It can be explicitly turned ON using `tedge config`.
+Auto-registration of entities can be enabled/disabled via tedge configuration.
+
+Users are highly encouraged to register the devices manually as it allows devices full control over their registration process. Meta information can also be added to the device to better describe the device's custom type and function.
 :::
 
 ### Entity store