diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java
index d1585b4a6..da7e496cf 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java
@@ -225,10 +225,11 @@ public class StreamManagement {
             if (condition == null && textElements.isEmpty()) {
                 xml.closeEmptyElement();
             } else {
-                xml.rightAngleBracket();
                 if (condition != null) {
+                    xml.rightAngleBracket();
                     xml.append(condition.toString());
                     xml.xmlnsAttribute(StanzaError.NAMESPACE);
+                    xml.closeEmptyElement();
                 }
                 xml.append(textElements);
                 xml.closeElement(ELEMENT);