diff --git a/src/sakia/core/net/api/bma/access.py b/src/sakia/core/net/api/bma/access.py
index fd0fa7ee5b36328753f754a6dbb68eb00689af75..409380126cbf5cada8504519fe0f96f41277bb20 100644
--- a/src/sakia/core/net/api/bma/access.py
+++ b/src/sakia/core/net/api/bma/access.py
@@ -297,10 +297,12 @@ class BmaAccess(QObject):
         .. note:: If one node accept the requests (returns 200),
         the broadcast should be considered accepted by the network.
         """
-        nodes = self._network.synced_nodes
+        nodes = random.sample(self._network.synced_nodes, 6) \
+            if len(self._network.synced_nodes) > 6 \
+            else self._network.synced_nodes
         replies = []
         if len(nodes) > 0:
-            for node in random.sample(nodes, 6):
+            for node in nodes:
                 logging.debug("Trying to connect to : " + node.pubkey)
                 conn_handler = node.endpoint.conn_handler()
                 req = request(conn_handler, **req_args)
diff --git a/src/sakia/tests/functional/certification/test_certification.py b/src/sakia/tests/functional/certification/test_certification.py
index 7be9015d4b45ee5c47030dab40135e53dcd5f109..571766802261f27d67488786f7c2fc6fef7e2c73 100644
--- a/src/sakia/tests/functional/certification/test_certification.py
+++ b/src/sakia/tests/functional/certification/test_certification.py
@@ -65,8 +65,8 @@ class TestCertificationDialog(unittest.TestCase, QuamashTest):
             self.assertEqual(result, QDialog.Accepted)
 
         def close_dialog():
-            if certification_dialog.isVisible():
-                certification_dialog.close()
+            if certification_dialog.widget.isVisible():
+                certification_dialog.widget.close()
 
         async def exec_test():
             await asyncio.sleep(1)