diff --git a/packages/server/lib/modes/record.coffee b/packages/server/lib/modes/record.coffee
index c74de0240d45..f911b7a2983e 100644
--- a/packages/server/lib/modes/record.coffee
+++ b/packages/server/lib/modes/record.coffee
@@ -23,7 +23,7 @@ logException = (err) ->
 
 module.exports = {
   getBranch: (repo) ->
-    for branch in ["CIRCLE_BRANCH", "TRAVIS_BRANCH", "CI_BRANCH"]
+    for branch in ["CIRCLE_BRANCH", "TRAVIS_BRANCH", "BUILDKITE_BRANCH", "CI_BRANCH"]
       if b = process.env[branch]
         return Promise.resolve(b)
 
diff --git a/packages/server/test/unit/modes/record_spec.coffee b/packages/server/test/unit/modes/record_spec.coffee
index 288a46f63e95..4aed56a6ea70 100644
--- a/packages/server/test/unit/modes/record_spec.coffee
+++ b/packages/server/test/unit/modes/record_spec.coffee
@@ -46,6 +46,13 @@ describe "lib/modes/record", ->
       record.getBranch(@repo).then (ret) ->
         expect(ret).to.eq("bem/travis")
 
+    it "gets branch from process.env.BUILDKITE_BRANCH", ->
+      process.env.BUILDKITE_BRANCH = "bem/buildkite"
+      process.env.CI_BRANCH     = "bem/ci"
+
+      record.getBranch(@repo).then (ret) ->
+        expect(ret).to.eq("bem/buildkite")
+
     it "gets branch from process.env.CI_BRANCH", ->
       process.env.CI_BRANCH     = "bem/ci"