diff --git a/docs/server/source/drivers-clients/index.rst b/docs/server/source/drivers-clients/index.rst
index 704832c0..18894f60 100644
--- a/docs/server/source/drivers-clients/index.rst
+++ b/docs/server/source/drivers-clients/index.rst
@@ -15,7 +15,6 @@ community projects listed below.
    :maxdepth: 1
 
    http-client-server-api
-   websocket-event-stream-api
    The Python Driver <https://docs.bigchaindb.com/projects/py-driver/en/latest/index.html>
    Transaction CLI <https://docs.bigchaindb.com/projects/cli/en/latest/>
 
diff --git a/docs/server/source/index.rst b/docs/server/source/index.rst
index 6ac4b9f5..7a458934 100644
--- a/docs/server/source/index.rst
+++ b/docs/server/source/index.rst
@@ -11,6 +11,7 @@ BigchainDB Server Documentation
    nodes/index
    dev-and-test/index
    server-reference/index
+   websocket-event-stream-api
    drivers-clients/index
    clusters-feds/index
    data-models/index
diff --git a/docs/server/source/drivers-clients/websocket-event-stream-api.rst b/docs/server/source/websocket-event-stream-api.rst
similarity index 97%
rename from docs/server/source/drivers-clients/websocket-event-stream-api.rst
rename to docs/server/source/websocket-event-stream-api.rst
index 22effbc1..88efb7bb 100644
--- a/docs/server/source/drivers-clients/websocket-event-stream-api.rst
+++ b/docs/server/source/websocket-event-stream-api.rst
@@ -1,9 +1,6 @@
 The WebSocket Event Stream API
 ==============================
 
-.. important::
-    This is currently scheduled to be implemented in BigchainDB Server 0.10.
-
 BigchainDB provides real-time event streams over the WebSocket protocol with
 the Event Stream API.