diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 221da8adf32..d5b5a84d477 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -145,7 +145,7 @@ module Ci
     private
 
     def runner_queue_key
-      "runner:build_queue:#{self.id}"
+      "runner:build_queue:#{self.token}"
     end
 
     def tag_constraints