diff --git a/omemo/xmpp.py b/omemo/xmpp.py
index b7a66966745507529b2ba42cbb31a9fd3ff7d0f3..da28dfe17fc3a0dd965ce2b55527f559325a7af7 100644
--- a/omemo/xmpp.py
+++ b/omemo/xmpp.py
@@ -98,7 +98,8 @@ class BundleInformationQuery(Iq):
         id_ = gajim.get_an_id()
         attrs = {'id': id_}
         Iq.__init__(self, typ='get', attrs=attrs, to=contact_jid)
-        items = Node('items', attrs={'node': NS_BUNDLES + str(device_id)})
+        items = Node('items', attrs={'node': NS_BUNDLES + str(device_id),
+                                     'max_items': 1})
         pubsub = PubsubNode(items)
         self.addChild(node=pubsub)
 
@@ -138,7 +139,7 @@ class DevicelistQuery(Iq):
         id_ = gajim.get_an_id()
         attrs = {'id': id_}
         Iq.__init__(self, typ='get', attrs=attrs, to=contact_jid)
-        items = Node('items', attrs={'node': NS_DEVICE_LIST})
+        items = Node('items', attrs={'node': NS_DEVICE_LIST, 'max_items': 1})
         pubsub = PubsubNode(items)
         self.addChild(node=pubsub)