diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index cdc3840f1..c3be07bb5 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -45,6 +45,9 @@ public abstract class AbstractGenerator {
 	private final String[] PRIVACY_SENSITIVE = {
 			"urn:xmpp:time" //XEP-0202: Entity Time leaks time zone
 	};
+	private final String[] OTR = {
+			"urn:xmpp:otr:0"
+	};
 	private String mVersion = null;
 	protected final String IDENTITY_NAME = "Conversations";
 	protected final String IDENTITY_TYPE = "phone";
@@ -105,6 +108,9 @@ public abstract class AbstractGenerator {
 		if (!mXmppConnectionService.useTorToConnect()) {
 			features.addAll(Arrays.asList(PRIVACY_SENSITIVE));
 		}
+		if (Config.supportOtr()) {
+			features.addAll(Arrays.asList(OTR));
+		}
 		Collections.sort(features);
 		return features;
 	}