diff --git a/duniterpy/documents/peer.py b/duniterpy/documents/peer.py
index ef06526cda28e2bf3cf93d262b96eb245eafd6c7..1858e77d638f35676b9c04e7fc4bd5c0b5d86f4b 100644
--- a/duniterpy/documents/peer.py
+++ b/duniterpy/documents/peer.py
@@ -189,10 +189,10 @@ class BMAEndpoint(Endpoint):
         """
         if self.server:
             return ConnectionHandler("http", "ws", self.server, self.port, proxy, session)
-        elif self.ipv4:
-            return ConnectionHandler("http", "ws", self.ipv4, self.port, proxy, session)
-        else:
+        elif self.ipv6:
             return ConnectionHandler("http", "ws", "[{0}]".format(self.ipv6), self.port, proxy, session)
+        else:
+            return ConnectionHandler("http", "ws", self.ipv4, self.port, proxy, session)
 
     def __str__(self):
         return self.inline()
@@ -244,7 +244,7 @@ class SecuredBMAEndpoint(BMAEndpoint):
         """
         if self.server:
             return ConnectionHandler("https", "wss", self.server, self.port, proxy, session)
-        elif self.ipv4:
-            return ConnectionHandler("https", "wss", self.ipv4, self.port, proxy, session)
-        else:
+        elif self.ipv6:
             return ConnectionHandler("https", "wss", "[{0}]".format(self.ipv6), self.port, proxy, session)
+        else:
+            return ConnectionHandler("https", "wss", self.ipv4, self.port, proxy, session)
diff --git a/setup.py b/setup.py
index 0c72f9f47ef8e248b7d07931115ee565aa30337c..d6bb9ab8e46fc056acf218841fe39a691c3a227d 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@ import duniterpy
 import os
 import re
 
+
 def which(program):
     """
     Detect whether or not a program is installed.