diff --git a/cmd/server/build.sh b/cmd/server/build.sh
index c946a78ef0a..a567b13fd5b 100755
--- a/cmd/server/build.sh
+++ b/cmd/server/build.sh
@@ -60,7 +60,6 @@ echo "--- go build"
 PACKAGES=(
   github.com/sourcegraph/sourcegraph/cmd/github-proxy
   github.com/sourcegraph/sourcegraph/cmd/gitserver
-  github.com/sourcegraph/sourcegraph/cmd/query-runner
   github.com/sourcegraph/sourcegraph/cmd/searcher
   github.com/sourcegraph/sourcegraph/cmd/symbols
   github.com/google/zoekt/cmd/zoekt-archive-index
diff --git a/cmd/server/shared/globals.go b/cmd/server/shared/globals.go
index ea3f50c5d0c..ca6b2e444dc 100644
--- a/cmd/server/shared/globals.go
+++ b/cmd/server/shared/globals.go
@@ -17,7 +17,6 @@ var SrcProfServices = []map[string]string{
 	{"Name": "searcher", "Host": "127.0.0.1:6069"},
 	{"Name": "symbols", "Host": "127.0.0.1:6071"},
 	{"Name": "repo-updater", "Host": "127.0.0.1:6074"},
-	{"Name": "query-runner", "Host": "127.0.0.1:6067"},
 	{"Name": "worker", "Host": "127.0.0.1:6089"},
 	{"Name": "precise-code-intel-worker", "Host": "127.0.0.1:6088"},
 	// no executors in server image
diff --git a/cmd/server/shared/shared.go b/cmd/server/shared/shared.go
index 19760aee5cc..31d636ba4a0 100644
--- a/cmd/server/shared/shared.go
+++ b/cmd/server/shared/shared.go
@@ -137,7 +137,6 @@ func Main() {
 		nginx,
 		`frontend: env CONFIGURATION_MODE=server frontend`,
 		gitserverLine,
-		`query-runner: query-runner`,
 		`symbols: symbols`,
 		`searcher: searcher`,
 		`github-proxy: github-proxy`,
diff --git a/enterprise/dev/ci/images/images.go b/enterprise/dev/ci/images/images.go
index a55817a323e..10542b084ad 100644
--- a/enterprise/dev/ci/images/images.go
+++ b/enterprise/dev/ci/images/images.go
@@ -72,7 +72,6 @@ var DeploySourcegraphDockerImages = []string{
 	"postgres_exporter",
 	"precise-code-intel-worker",
 	"prometheus",
-	"query-runner",
 	"redis-cache",
 	"redis-store",
 	"redis_exporter",
diff --git a/enterprise/dev/src-prof-services.json b/enterprise/dev/src-prof-services.json
index 5d23c827b50..718c5dbc8ec 100644
--- a/enterprise/dev/src-prof-services.json
+++ b/enterprise/dev/src-prof-services.json
@@ -4,7 +4,6 @@
   { "Name": "searcher", "Host": "127.0.0.1:6069" },
   { "Name": "symbols", "Host": "127.0.0.1:6071" },
   { "Name": "repo-updater", "Host": "127.0.0.1:6074" },
-  { "Name": "query-runner", "Host": "127.0.0.1:6067" },
   { "Name": "precise-code-intel-worker", "Host": "127.0.0.1:6088" },
   { "Name": "worker", "Host": "127.0.0.1:6089" }
 ]