diff --git a/xmpp/handlers.go b/xmpp/handlers.go
index 9811428..b847cac 100644
--- a/xmpp/handlers.go
+++ b/xmpp/handlers.go
@@ -2533,6 +2533,7 @@ func handleSetQueryMAM2(s xmpp.Sender, iq *stanza.IQ, query *extensions.MAM2Quer
 	if beyond {
 		count := 0
 		rs.Count = &count
+		log.Debugf("MAM: beyond")
 	} else {
 		if len(messages) > 0 {
 			if fromStart {
@@ -2575,7 +2576,14 @@ func handleSetQueryMAM2(s xmpp.Sender, iq *stanza.IQ, query *extensions.MAM2Quer
 			rs.Last = &last
 		}
 	}
-	log.Debugf("MAM fin: %#v", answer.Payload)
+	if log.GetLevel() == log.DebugLevel {
+		xmlFin, err := xml.Marshal(answer.Payload)
+		if err == nil {
+			log.Debug(string(xmlFin))
+		} else {
+			log.Debugf("MAM fin: %#v %#v", answer.Payload, rs)
+		}
+	}
 }
 
 func iqAnswerSetError(answer *stanza.IQ, code int) {