1 files changed, 1 insertions, 1 deletions
diff --git a/xmpp-vala/src/module/xep/0313_2_message_archive_management.vala b/xmpp-vala/src/module/xep/0313_2_message_archive_management.vala
index dde7d9b0..b25f6106 100644
--- a/xmpp-vala/src/module/xep/0313_2_message_archive_management.vala
+++ b/xmpp-vala/src/module/xep/0313_2_message_archive_management.vala
@@ -52,7 +52,7 @@ namespace Xmpp.MessageArchiveManagement.V2 {
             field.set_value_string(DateTimeProfiles.to_datetime(mam_params.start));
             fields.add(field);
         }
-        if (mam_params.end != null) {
+        if (mam_params.end != null && mam_params.end_id == null && !mam_params.use_ns2_extended) {
             DataForms.DataForm.Field field = new DataForms.DataForm.Field() { var="end" };
             field.set_value_string(DateTimeProfiles.to_datetime(mam_params.end));
             fields.add(field);