diff --git a/README.md b/README.md
index 004b346..38caf3d 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,6 @@ _Revoke your API-KEYs and API-SECRETs immediately if you think they might have b
 
 ### Advanced features
 * [Using custom notifications](#using-custom-notifications)
-* [Setting up connection multiplexing](#setting-up-connection-multiplexing)
 
 ### Examples
 * [Creating a new order](#creating-a-new-order)
@@ -264,27 +263,6 @@ def on_notification(notification: Notification[Any]):
     print(notification.data) # { "foo": 1 }
 ```
 
-## Setting up connection multiplexing
-
-`BfxWebSocketClient::run` and `BfxWebSocketClient::start` accept a `connections` argument:
-```python
-bfx.wss.run(connections=3)
-```
-
-`connections` indicates the number of connections to run concurrently (through connection multiplexing).
-
-Each of these connections can handle up to 25 subscriptions to public channels. \
-So, using `N` connections will allow the client to handle at most `N * 25` subscriptions. \
-You should always use the minimum number of connections necessary to handle all the subscriptions that will be made.
-
-For example, if you know that your application will subscribe to 75 public channels, 75 / 25 = 3 connections will be enough to handle all the subscriptions.
-
-The default number of connections is 5; therefore, if the `connections` argument is not given, the client will be able to handle a maximum of 25 * 5 = 125 subscriptions.
-
-Keep in mind that using a large number of connections could slow down the client performance.
-
-The use of more than 20 connections is not recommended.
-
 # Examples
 
 ## Creating a new order
diff --git a/bfxapi/websocket/_client/bfx_websocket_client.py b/bfxapi/websocket/_client/bfx_websocket_client.py
index 48d525e..5063946 100644
--- a/bfxapi/websocket/_client/bfx_websocket_client.py
+++ b/bfxapi/websocket/_client/bfx_websocket_client.py
@@ -29,7 +29,6 @@ from bfxapi.websocket.exceptions import \
     InvalidCredentialError, \
     ReconnectionTimeoutError, \
     VersionMismatchError, \
-    ZeroConnectionsError, \
     UnknownChannelError, \
     UnknownSubscriptionError
 
@@ -246,27 +245,35 @@ class BfxWebSocketClient(Connection):
                         message[0] == 0 and message[1] != Connection._HEARTBEAT:
                     self.__handler.handle(message[1], message[2])
 
+    async def __new_bucket(self) -> BfxWebSocketBucket:
+        bucket = BfxWebSocketBucket( \
+            self._host, self.__event_emitter)
+
+        self.__buckets[bucket] = asyncio \
+            .create_task(bucket.start())
+
+        await bucket.wait()
+
+        return bucket
+
     @Connection.require_websocket_connection
     async def subscribe(self,
                         channel: str,
                         sub_id: Optional[str] = None,
                         **kwargs: Any) -> None:
-        if len(self.__buckets) == 0:
-            raise ZeroConnectionsError("Unable to subscribe: " \
-                "the number of connections must be greater than 0.")
-
         if not channel in ["ticker", "trades", "book", "candles", "status"]:
             raise UnknownChannelError("Available channels are: " + \
                 "ticker, trades, book, candles and status.")
 
-        _buckets = list(self.__buckets.keys())
+        for bucket in self.__buckets:
+            if not bucket.is_full:
+                return await bucket.subscribe( \
+                    channel, sub_id, **kwargs)
 
-        counters = [ bucket.count for bucket in _buckets ]
+        bucket = await self.__new_bucket()
 
-        index = counters.index(min(counters))
-
-        await _buckets[index] \
-            .subscribe(channel, sub_id, **kwargs)
+        return await bucket.subscribe( \
+            channel, sub_id, **kwargs)
 
     @Connection.require_websocket_connection
     async def unsubscribe(self, sub_id: str) -> None:
diff --git a/bfxapi/websocket/exceptions.py b/bfxapi/websocket/exceptions.py
index 1720122..e7019ab 100644
--- a/bfxapi/websocket/exceptions.py
+++ b/bfxapi/websocket/exceptions.py
@@ -11,11 +11,6 @@ class FullBucketError(BfxBaseException):
     Thrown when a user attempts a subscription but all buckets are full.
     """
 
-class ZeroConnectionsError(BfxBaseException):
-    """
-    This error indicates an attempt to subscribe to a public channel while the number of connections is 0.
-    """
-
 class ReconnectionTimeoutError(BfxBaseException):
     """
     This error indicates that the connection has been offline for too long without being able to reconnect.