diff --git a/cmd/scw/testdata/test-all-usage-iot-device-create-usage.golden b/cmd/scw/testdata/test-all-usage-iot-device-create-usage.golden
index d199ae7ded..79dae73d04 100644
--- a/cmd/scw/testdata/test-all-usage-iot-device-create-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-iot-device-create-usage.golden
@@ -10,10 +10,10 @@ ARGS:
   hub-id                                       ID of the device's hub
   [allow-insecure]                             Allow plain and server-authenticated SSL connections in addition to mutually-authenticated ones
   [allow-multiple-connections]                 Allow multiple physical devices to connect with this device's credentials
-  [message-filters.publish.policy]              (unknown | accept | reject)
-  [message-filters.publish.topics.{index}]     
-  [message-filters.subscribe.policy]            (unknown | accept | reject)
-  [message-filters.subscribe.topics.{index}]   
+  [message-filters.publish.policy]             How to use the topic list (unknown | accept | reject)
+  [message-filters.publish.topics.{index}]     List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters
+  [message-filters.subscribe.policy]           How to use the topic list (unknown | accept | reject)
+  [message-filters.subscribe.topics.{index}]   List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters
   [description]                                Device description
   [region=fr-par]                              Region to target. If none is passed will use default region from the config (fr-par)
 
diff --git a/cmd/scw/testdata/test-all-usage-iot-device-update-usage.golden b/cmd/scw/testdata/test-all-usage-iot-device-update-usage.golden
index 6a447b0de1..29b761e4d5 100644
--- a/cmd/scw/testdata/test-all-usage-iot-device-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-iot-device-update-usage.golden
@@ -10,10 +10,10 @@ ARGS:
   [description]                                Device description
   [allow-insecure]                             Allow plain and server-authenticated SSL connections in addition to mutually-authenticated ones
   [allow-multiple-connections]                 Allow multiple physical devices to connect with this device's credentials
-  [message-filters.publish.policy]              (unknown | accept | reject)
-  [message-filters.publish.topics.{index}]     
-  [message-filters.subscribe.policy]            (unknown | accept | reject)
-  [message-filters.subscribe.topics.{index}]   
+  [message-filters.publish.policy]             How to use the topic list (unknown | accept | reject)
+  [message-filters.publish.topics.{index}]     List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters
+  [message-filters.subscribe.policy]           How to use the topic list (unknown | accept | reject)
+  [message-filters.subscribe.topics.{index}]   List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters
   [hub-id]                                     Change Hub for this device, additional fees may apply, see IoT Hub pricing
   [region=fr-par]                              Region to target. If none is passed will use default region from the config (fr-par)
 
diff --git a/docs/commands/iot.md b/docs/commands/iot.md
index db505af9a2..301f94b24d 100644
--- a/docs/commands/iot.md
+++ b/docs/commands/iot.md
@@ -61,10 +61,10 @@ scw iot device create [arg=value ...]
 | hub-id | Required | ID of the device's hub |
 | allow-insecure |  | Allow plain and server-authenticated SSL connections in addition to mutually-authenticated ones |
 | allow-multiple-connections |  | Allow multiple physical devices to connect with this device's credentials |
-| message-filters.publish.policy | One of: `unknown`, `accept`, `reject` |  |
-| message-filters.publish.topics.{index} |  |  |
-| message-filters.subscribe.policy | One of: `unknown`, `accept`, `reject` |  |
-| message-filters.subscribe.topics.{index} |  |  |
+| message-filters.publish.policy | One of: `unknown`, `accept`, `reject` | How to use the topic list |
+| message-filters.publish.topics.{index} |  | List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters |
+| message-filters.subscribe.policy | One of: `unknown`, `accept`, `reject` | How to use the topic list |
+| message-filters.subscribe.topics.{index} |  | List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters |
 | description |  | Device description |
 | region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
 
@@ -275,10 +275,10 @@ scw iot device update <device-id ...> [arg=value ...]
 | description |  | Device description |
 | allow-insecure |  | Allow plain and server-authenticated SSL connections in addition to mutually-authenticated ones |
 | allow-multiple-connections |  | Allow multiple physical devices to connect with this device's credentials |
-| message-filters.publish.policy | One of: `unknown`, `accept`, `reject` |  |
-| message-filters.publish.topics.{index} |  |  |
-| message-filters.subscribe.policy | One of: `unknown`, `accept`, `reject` |  |
-| message-filters.subscribe.topics.{index} |  |  |
+| message-filters.publish.policy | One of: `unknown`, `accept`, `reject` | How to use the topic list |
+| message-filters.publish.topics.{index} |  | List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters |
+| message-filters.subscribe.policy | One of: `unknown`, `accept`, `reject` | How to use the topic list |
+| message-filters.subscribe.topics.{index} |  | List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters |
 | hub-id |  | Change Hub for this device, additional fees may apply, see IoT Hub pricing |
 | region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
 
diff --git a/internal/namespaces/iot/v1/iot_cli.go b/internal/namespaces/iot/v1/iot_cli.go
index 51a21e0d5e..b3826ea572 100644
--- a/internal/namespaces/iot/v1/iot_cli.go
+++ b/internal/namespaces/iot/v1/iot_cli.go
@@ -684,6 +684,7 @@ func iotDeviceCreate() *core.Command {
 			},
 			{
 				Name:       "message-filters.publish.policy",
+				Short:      `How to use the topic list`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -691,12 +692,14 @@ func iotDeviceCreate() *core.Command {
 			},
 			{
 				Name:       "message-filters.publish.topics.{index}",
+				Short:      `List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
 			},
 			{
 				Name:       "message-filters.subscribe.policy",
+				Short:      `How to use the topic list`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -704,6 +707,7 @@ func iotDeviceCreate() *core.Command {
 			},
 			{
 				Name:       "message-filters.subscribe.topics.{index}",
+				Short:      `List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -798,6 +802,7 @@ func iotDeviceUpdate() *core.Command {
 			},
 			{
 				Name:       "message-filters.publish.policy",
+				Short:      `How to use the topic list`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -805,12 +810,14 @@ func iotDeviceUpdate() *core.Command {
 			},
 			{
 				Name:       "message-filters.publish.topics.{index}",
+				Short:      `List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
 			},
 			{
 				Name:       "message-filters.subscribe.policy",
+				Short:      `How to use the topic list`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -818,6 +825,7 @@ func iotDeviceUpdate() *core.Command {
 			},
 			{
 				Name:       "message-filters.subscribe.topics.{index}",
+				Short:      `List of topics to accept or reject. It must be valid MQTT topics and up to 65535 characters`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,