diff --git a/src/tmp/wokkel/mam.py b/src/tmp/wokkel/mam.py
index abb5ddbd..37996024 100644
--- a/src/tmp/wokkel/mam.py
+++ b/src/tmp/wokkel/mam.py
@@ -200,8 +200,8 @@ class MAMPrefs():
         for attr in ('always', 'never'):
             attr_elt = mam_elt.addElement(attr)
             jids = getattr(self, attr)
-            for jid in jids:
-                attr_elt.addElement('jid', content=jid.full())
+            for jid_ in jids:
+                attr_elt.addElement('jid', content=jid_.full())
         return mam_elt
 
     def render(self, parent):
@@ -521,6 +521,8 @@ class MAMService(XMPPHandler, IQHandlerMixin):
         iq.handled = True
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=''):
+        if nodeIdentifier:
+            return []
         return [disco.DiscoFeature(NS_MAM)]
 
     def getDiscoItems(self, requestor, target, nodeIdentifier=''):