diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
index db6f717033d6549b02a21bd1c24e99acea4dc487..9fc6dff754f605cff3cc2d16b80cad724f47c603 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
@@ -56,10 +56,7 @@ public abstract class ScramMechanism extends SaslMechanism {
         super(account);
         this.channelBinding = channelBinding;
         if (channelBinding == ChannelBinding.NONE) {
-            // TODO this needs to be changed to "y,," for the scram internal down grade protection
-            // but we might risk compatibility issues if the server supports a binding that we don’t
-            // support
-            this.gs2Header = "n,,";
+            this.gs2Header = "y,,";
         } else {
             this.gs2Header =
                     String.format(