diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/tap-aggregation.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/tap-aggregation.md
index d4ae53f10a3..9b5ec2d0e82 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/tap-aggregation.md
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/tap-aggregation.md
@@ -60,12 +60,12 @@ interface Management1
 !
 tap aggregation
    mode exclusive profile tap-aggregation-extended
-   mode exclusive no-errdisable Ethernet1/1
-   mode exclusive no-errdisable Ethetnet 42/1
-   mode exclusive no-errdisable Port-Channel200
    encapsulation dot1br strip
    encapsulation vn-tag strip
    protocol lldp trap
+   mode exclusive no-errdisable Ethernet1/1
+   mode exclusive no-errdisable Ethetnet 42/1
+   mode exclusive no-errdisable Port-Channel200
    truncation size 169
    mac timestamp header format 64-bit
    mac timestamp header eth-type 5
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/tap-aggregation.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/tap-aggregation.cfg
index b5d085c8d21..64c5310b751 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/tap-aggregation.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/tap-aggregation.cfg
@@ -1,12 +1,12 @@
 !
 tap aggregation
    mode exclusive profile tap-aggregation-extended
-   mode exclusive no-errdisable Ethernet1/1
-   mode exclusive no-errdisable Ethetnet 42/1
-   mode exclusive no-errdisable Port-Channel200
    encapsulation dot1br strip
    encapsulation vn-tag strip
    protocol lldp trap
+   mode exclusive no-errdisable Ethernet1/1
+   mode exclusive no-errdisable Ethetnet 42/1
+   mode exclusive no-errdisable Port-Channel200
    truncation size 169
    mac timestamp header format 64-bit
    mac timestamp header eth-type 5
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tap-aggregation.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tap-aggregation.j2
index e00e2195632..5492d424684 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tap-aggregation.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tap-aggregation.j2
@@ -15,9 +15,6 @@ tap aggregation
 {%             endif %}
    {{ mode_cli }}
 {%         endif %}
-{%         for interface in tap_aggregation.mode.exclusive.no_errdisable | arista.avd.natural_sort %}
-   mode exclusive no-errdisable {{ interface }}
-{%         endfor %}
 {%     endif %}
 {%     if tap_aggregation.encapsulation_dot1br_strip is arista.avd.defined(true) %}
    encapsulation dot1br strip
@@ -28,6 +25,9 @@ tap aggregation
 {%     if tap_aggregation.protocol_lldp_trap is arista.avd.defined(true) %}
    protocol lldp trap
 {%     endif %}
+{%     for interface in tap_aggregation.mode.exclusive.no_errdisable | arista.avd.natural_sort %}
+   mode exclusive no-errdisable {{ interface }}
+{%     endfor %}
 {%     if tap_aggregation.truncation_size is arista.avd.defined %}
    truncation size {{ tap_aggregation.truncation_size }}
 {%     endif %}