diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 796920e29..8694e68c4 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -974,11 +974,7 @@ public class XmppConnection implements Runnable {
 		}
 
 		public boolean sm() {
-			if (connection.streamFeatures == null) {
-				return false;
-			} else {
-				return connection.streamFeatures.hasChild("sm");
-			}
+			return streamId != null;
 		}
 
 		public boolean csi() {