diff --git a/develop/README.md b/develop/README.md
index c23b18795c..ffae38891e 100644
--- a/develop/README.md
+++ b/develop/README.md
@@ -68,7 +68,6 @@ each service:
 | `filestore`        | 9235 |
 | `notifications`    | 9236 |
 | `real-time`        | 9237 |
-| `track-changes`    | 9238 |
 
 To attach to a service using Chrome's _remote debugging_, go to
 <chrome://inspect/> and make sure _Discover network targets_ is checked. Next
diff --git a/develop/dev.env b/develop/dev.env
index 28716b71fb..8a8f368fd4 100644
--- a/develop/dev.env
+++ b/develop/dev.env
@@ -13,8 +13,7 @@ PROJECT_HISTORY_HOST=project-history
 REALTIME_HOST=real-time
 REDIS_HOST=redis
 SPELLING_HOST=spelling
-TRACK_CHANGES_HOST=track-changes
 WEBPACK_HOST=webpack
 WEB_API_PASSWORD=sharelatex
 WEB_API_USER=sharelatex
-WEB_HOST=web
\ No newline at end of file
+WEB_HOST=web
diff --git a/develop/docker-compose.dev.yml b/develop/docker-compose.dev.yml
index 4cc3f36fe4..ae283b6b42 100644
--- a/develop/docker-compose.dev.yml
+++ b/develop/docker-compose.dev.yml
@@ -112,17 +112,6 @@ services:
       - ../services/real-time/app.js:/overleaf/services/real-time/app.js
       - ../services/real-time/config:/overleaf/services/real-time/config
 
-  track-changes:
-    command: ["npm", "run", "nodemon"]
-    environment:
-      - NODE_APP_OPTIONS=--inspect=0.0.0.0:9229
-    ports:
-      - "127.0.0.1:9238:9229"
-    volumes:
-      - ../services/track-changes/app:/overleaf/services/track-changes/app
-      - ../services/track-changes/app.js:/overleaf/services/track-changes/app.js
-      - ../services/track-changes/config:/overleaf/services/track-changes/config
-
   web:
     command: ["npm", "run", "nodemon"]
     environment:
diff --git a/develop/docker-compose.yml b/develop/docker-compose.yml
index b2f6caaf8b..e6c98ffd61 100644
--- a/develop/docker-compose.yml
+++ b/develop/docker-compose.yml
@@ -132,13 +132,6 @@ services:
     volumes:
       - spelling-cache:/overleaf/services/spelling/cache
 
-  track-changes:
-    build:
-      context: ..
-      dockerfile: services/track-changes/Dockerfile
-    env_file:
-      - dev.env
-
   web:
     build:
       context: ..
diff --git a/server-ce/config/settings.js b/server-ce/config/settings.js
index 3f0758c367..12e26569a3 100644
--- a/server-ce/config/settings.js
+++ b/server-ce/config/settings.js
@@ -118,20 +118,6 @@ const settings = {
         blockingKey({ doc_id }) {
           return `Blocking:${doc_id}`
         },
-        // track-changes:lock
-        historyLock({ doc_id }) {
-          return `HistoryLock:${doc_id}`
-        },
-        historyIndexLock({ project_id }) {
-          return `HistoryIndexLock:${project_id}`
-        },
-        // track-changes:history
-        uncompressedHistoryOps({ doc_id }) {
-          return `UncompressedHistoryOps:${doc_id}`
-        },
-        docsWithHistoryOps({ project_id }) {
-          return `DocsWithHistoryOps:${project_id}`
-        },
         // realtime
         clientsInProject({ project_id }) {
           return `clients_in_project:${project_id}`
@@ -142,7 +128,7 @@ const settings = {
       },
     }),
     fairy: redisConfig,
-    // track-changes and document-updater
+    // document-updater
     realtime: redisConfig,
     documentupdater: redisConfig,
     lock: redisConfig,
@@ -167,10 +153,6 @@ const settings = {
     },
   },
 
-  trackchanges: {
-    continueOnError: true,
-  },
-
   // Local disk caching
   // ------------------
   path: {
diff --git a/server-ce/runit/track-changes-sharelatex/run b/server-ce/runit/track-changes-sharelatex/run
deleted file mode 100755
index 968296af2c..0000000000
--- a/server-ce/runit/track-changes-sharelatex/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-NODE_PARAMS=""
-if [ "$DEBUG_NODE" == "true" ]; then
-    echo "running debug - track-changes"
-    NODE_PARAMS="--inspect=0.0.0.0:30150"
-fi
-
-exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/track-changes/app.js >> /var/log/sharelatex/track-changes.log 2>&1
diff --git a/server-ce/services.js b/server-ce/services.js
index 9426d67adc..a58892d5ed 100644
--- a/server-ce/services.js
+++ b/server-ce/services.js
@@ -14,9 +14,6 @@ module.exports = [
   {
     name: 'filestore'
   },
-  {
-    name: 'track-changes'
-  },
   {
     name: 'docstore'
   },