diff --git a/build/docker/config/dendrite-config.yaml b/build/docker/config/dendrite-config.yaml
index 8cc9934d4..7ebeeb6e7 100644
--- a/build/docker/config/dendrite-config.yaml
+++ b/build/docker/config/dendrite-config.yaml
@@ -133,17 +133,6 @@ client_api:
     turn_username: ""
     turn_password: ""
 
-# Configuration for the Current State Server.
-current_state_server:
-  internal_api:
-    listen: http://0.0.0.0:7782
-    connect: http://current_state_server:7782
-  database:
-    connection_string: postgresql://dendrite:itsasecret@postgres/dendrite_currentstate?sslmode=disable
-    max_open_conns: 100
-    max_idle_conns: 2
-    conn_max_lifetime: -1
-
 # Configuration for the EDU server.
 edu_server:
   internal_api:
diff --git a/build/docker/docker-compose.polylith.yml b/build/docker/docker-compose.polylith.yml
index 1f84e58d1..6dd743141 100644
--- a/build/docker/docker-compose.polylith.yml
+++ b/build/docker/docker-compose.polylith.yml
@@ -43,17 +43,6 @@ services:
     networks:
       - internal
 
-  current_state_server:
-    hostname: current_state_server
-    image: matrixdotorg/dendrite:currentstateserver
-    command: [
-      "--config=dendrite.yaml"
-    ]
-    volumes:
-      - ./config:/etc/dendrite
-    networks:
-      - internal
-
   sync_api:
     hostname: sync_api
     image: matrixdotorg/dendrite:syncapi
diff --git a/build/docker/images-build.sh b/build/docker/images-build.sh
index 443f30920..fdff51320 100755
--- a/build/docker/images-build.sh
+++ b/build/docker/images-build.sh
@@ -15,7 +15,6 @@ docker build -t matrixdotorg/dendrite:federationsender  --build-arg component=de
 docker build -t matrixdotorg/dendrite:federationproxy   --build-arg component=federation-api-proxy              -f build/docker/Dockerfile.component .
 docker build -t matrixdotorg/dendrite:keyserver         --build-arg component=dendrite-key-server               -f build/docker/Dockerfile.component .
 docker build -t matrixdotorg/dendrite:mediaapi          --build-arg component=dendrite-media-api-server         -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite:currentstateserver    --build-arg component=dendrite-current-state-server  -f build/docker/Dockerfile.component .
 docker build -t matrixdotorg/dendrite:roomserver        --build-arg component=dendrite-room-server              -f build/docker/Dockerfile.component .
 docker build -t matrixdotorg/dendrite:syncapi           --build-arg component=dendrite-sync-api-server          -f build/docker/Dockerfile.component .
 docker build -t matrixdotorg/dendrite:serverkeyapi      --build-arg component=dendrite-server-key-api-server    -f build/docker/Dockerfile.component .
diff --git a/build/docker/images-pull.sh b/build/docker/images-pull.sh
index b4a4b2fce..c6b09b6a4 100755
--- a/build/docker/images-pull.sh
+++ b/build/docker/images-pull.sh
@@ -11,7 +11,6 @@ docker pull matrixdotorg/dendrite:federationsender
 docker pull matrixdotorg/dendrite:federationproxy
 docker pull matrixdotorg/dendrite:keyserver
 docker pull matrixdotorg/dendrite:mediaapi
-docker pull matrixdotorg/dendrite:currentstateserver
 docker pull matrixdotorg/dendrite:roomserver
 docker pull matrixdotorg/dendrite:syncapi
 docker pull matrixdotorg/dendrite:userapi
diff --git a/build/docker/images-push.sh b/build/docker/images-push.sh
index ec1e860f0..4838c76f6 100755
--- a/build/docker/images-push.sh
+++ b/build/docker/images-push.sh
@@ -11,7 +11,6 @@ docker push matrixdotorg/dendrite:federationsender
 docker push matrixdotorg/dendrite:federationproxy
 docker push matrixdotorg/dendrite:keyserver
 docker push matrixdotorg/dendrite:mediaapi
-docker push matrixdotorg/dendrite:currentstateserver
 docker push matrixdotorg/dendrite:roomserver
 docker push matrixdotorg/dendrite:syncapi
 docker push matrixdotorg/dendrite:serverkeyapi
diff --git a/build/docker/postgres/create_db.sh b/build/docker/postgres/create_db.sh
index 222675f6e..70d6743e4 100644
--- a/build/docker/postgres/create_db.sh
+++ b/build/docker/postgres/create_db.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-for db in account device mediaapi syncapi roomserver serverkey keyserver federationsender currentstate appservice e2ekey naffka; do
+for db in account device mediaapi syncapi roomserver serverkey keyserver federationsender appservice e2ekey naffka; do
     createdb -U dendrite -O dendrite dendrite_$db
 done
diff --git a/dendrite-config.yaml b/dendrite-config.yaml
index 570669c1a..be0972e4a 100644
--- a/dendrite-config.yaml
+++ b/dendrite-config.yaml
@@ -141,17 +141,6 @@ client_api:
     threshold: 5
     cooloff_ms: 500
 
-# Configuration for the Current State Server.
-current_state_server:
-  internal_api:
-    listen: http://localhost:7782
-    connect: http://localhost:7782
-  database:
-    connection_string: file:currentstate.db
-    max_open_conns: 100
-    max_idle_conns: 2
-    conn_max_lifetime: -1
-
 # Configuration for the EDU server.
 edu_server:
   internal_api:
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index dedcf1517..7a7fb03ee 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -109,7 +109,7 @@ Assuming that Postgres 9.5 (or later) is installed:
 * Create the component databases:
 
   ```bash
-  for i in account device mediaapi syncapi roomserver serverkey federationsender currentstate appservice e2ekey naffka; do
+  for i in account device mediaapi syncapi roomserver serverkey federationsender appservice e2ekey naffka; do
       sudo -u postgres createdb -O dendrite dendrite_$i
   done
   ```
@@ -239,16 +239,6 @@ This is what implements the room DAG. Clients do not talk to this.
 ./bin/dendrite-room-server --config=dendrite.yaml
 ```
 
-#### Current state server
-
-This tracks the current state of rooms which various components need to know. For example,
-`/publicRooms` implemented by client API asks this server for the room names, joined member
-counts, etc.
-
-```bash
-./bin/dendrite-current-state-server --config=dendrite.yaml
-```
-
 #### Federation sender
 
 This sends events from our users to other servers.  This is only required if