diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb
index ad8c1c4407c..5ac9181f878 100644
--- a/lib/api/helpers/runner.rb
+++ b/lib/api/helpers/runner.rb
@@ -20,6 +20,8 @@ module API
 
       def authenticate_runner!
         forbidden! unless current_runner
+
+        update_runner_info
       end
 
       def current_runner
diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index 80feb629d54..50cb1df92ad 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -78,7 +78,6 @@ module API
       post '/request' do
         authenticate_runner!
         no_content! unless current_runner.active?
-        update_runner_info
 
         if current_runner.runner_queue_value_latest?(params[:last_update])
           header 'X-GitLab-Last-Update', params[:last_update]