diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee
index 9f8df741dd..9690225645 100644
--- a/libraries/metrics/metrics.coffee
+++ b/libraries/metrics/metrics.coffee
@@ -1,5 +1,5 @@
-traceAgent = require('@google-cloud/trace-agent')
 debugAgent = require('@google-cloud/debug-agent')
+traceAgent = require('@google-cloud/trace-agent')
 
 prom = require('prom-client')
 Register = require('prom-client').register
@@ -21,7 +21,8 @@ module.exports = Metrics =
 	initialize: (_name) ->
 		appname = _name
 		collectDefaultMetrics({ timeout: 5000, prefix: Metrics.buildPromKey()})
-		traceAgent.start()
+		if process.env['ENABLE_TRACE_AGENT'] == "true"
+			traceAgent.start()
 		debugAgent.start({
 			serviceContext: {
 				allowExpressions: true,
diff --git a/libraries/metrics/package.json b/libraries/metrics/package.json
index c56b67ab3d..0d2f4010d2 100644
--- a/libraries/metrics/package.json
+++ b/libraries/metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metrics-sharelatex",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "A drop-in metrics and monitoring module for node.js apps",
   "repository": {
     "type": "git",