diff --git a/xmpp/handlers.go b/xmpp/handlers.go
index 506d9e6..a82d315 100644
--- a/xmpp/handlers.go
+++ b/xmpp/handlers.go
@@ -831,8 +831,8 @@ func handleGetDiscoInfo(s xmpp.Sender, iq *stanza.IQ, di *stanza.DiscoInfo) {
 		bare, _, fromOk := gateway.SplitJID(iq.From)
 		if fromOk {
 			session, sessionOk := sessions[bare]
-			if sessionOk && session.Session.MUC && toIsGroup {
-				if toOk {
+			if sessionOk && session.Session.MUC {
+				if toOk && toIsGroup {
 					chat, _, err := session.GetContactByID(toID, nil)
 					if err == nil && session.IsGroup(chat) {
 						isMuc = true
@@ -868,7 +868,7 @@ func handleGetDiscoInfo(s xmpp.Sender, iq *stanza.IQ, di *stanza.DiscoInfo) {
 
 						disco.Form = stanza.NewForm(fields, "result")
 					}
-				} else {
+				} else if !toOk {
 					disco.AddFeatures(
 						stanza.NSDiscoItems,
 						"http://jabber.org/protocol/muc#stable_id",