diff --git a/source/Network/Xmpp/Stream.hs b/source/Network/Xmpp/Stream.hs
index 0880717..2fa3681 100644
--- a/source/Network/Xmpp/Stream.hs
+++ b/source/Network/Xmpp/Stream.hs
@@ -110,14 +110,16 @@ pickleStreamFeatures :: PU [Node] ServerFeatures
 pickleStreamFeatures = xpWrap
     (\(tls, sasl, rest) -> SF tls (mbl sasl) rest)
     (\(SF tls sasl rest) -> (tls, lmb sasl, rest))
-    (xpDefault (Nothing, Nothing, []) -- In case there is no features element.
-         (xpElemNodes (Name
-             "features" (Just "http://etherx.jabber.org/streams") (Just "stream"))
-             (xpTriple
-                  (xpOption pickleTLSFeature)
-                  (xpOption pickleSaslFeature)
-                  (xpAll xpElemVerbatim)
-             )
+    (xpElemNodes
+         (Name
+             "features"
+             (Just "http://etherx.jabber.org/streams")
+             (Just "stream")
+         )
+         (xpTriple
+              (xpOption pickleTLSFeature)
+              (xpOption pickleSaslFeature)
+              (xpAll xpElemVerbatim)
          )
     )
   where