diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index ba488f359d..e92a033bef 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -31,7 +31,6 @@
 * [Message Expiry](message-expiry.md)
 * [Large Messages](large-messages.md)
 * [Paging](paging.md)
-* [Queue Attributes](queue-attributes.md)
 * [Scheduled Messages](scheduled-messages.md)
 * [Last-Value Queues](last-value-queues.md)
 * [Message Grouping](message-grouping.md)
diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md
index 3ae7cf5839..dd08046e02 100644
--- a/docs/user-manual/en/clusters.md
+++ b/docs/user-manual/en/clusters.md
@@ -802,8 +802,8 @@ after the last consumer on a queue is closed before redistributing. By
 default message redistribution is disabled.
 
 Message redistribution can be configured on a per address basis, by
-specifying the redistribution delay in the address settings, for more
-information on configuring address settings, please see [Queue Attributes](queue-attributes.md).
+specifying the redistribution delay in the address settings. For more
+information on configuring address settings, please see [Configuring Addresses and Queues via Address Settings](address-model.md#configuring-addresses-and-queues-via-address-settings).
 
 Here's an address settings snippet from `broker.xml`
 showing how message redistribution is enabled for a set of queues:
diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md
index 3c3da6f5a7..7ee29275eb 100644
--- a/docs/user-manual/en/flow-control.md
+++ b/docs/user-manual/en/flow-control.md
@@ -170,7 +170,7 @@ but instead pages messages to storage.
 
 To configure an address with a maximum size and tell the server that you
 want to block producers for this address if it becomes full, you need to
-define an AddressSettings ([Configuring Queues Via Address Settings](queue-attributes.md)) block for the address and specify
+define an AddressSettings ([Configuring Queues Via Address Settings](address-model.md#configuring-addresses-and-queues-via-address-setting)) block for the address and specify
 `max-size-bytes` and `address-full-policy`
 
 The address block applies to all queues registered to that address. I.e.
diff --git a/docs/user-manual/en/queue-attributes.md b/docs/user-manual/en/queue-attributes.md
deleted file mode 100644
index 156b9bad92..0000000000
--- a/docs/user-manual/en/queue-attributes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Address and Queue Attributes and Settings
-