diff --git a/lib/gitlab/sidekiq_status/client_middleware.rb b/lib/gitlab/sidekiq_status/client_middleware.rb
index 779a9998b224024220a5881d7197cce0dee83f9c..d47609f490d347e6af5e269c6ec3549388e4444f 100644
--- a/lib/gitlab/sidekiq_status/client_middleware.rb
+++ b/lib/gitlab/sidekiq_status/client_middleware.rb
@@ -2,7 +2,7 @@ module Gitlab
   module SidekiqStatus
     class ClientMiddleware
       def call(_, job, _, _)
-        SidekiqStatus.set(job['jid'])
+        Gitlab::SidekiqStatus.set(job['jid'])
         yield
       end
     end
diff --git a/lib/gitlab/sidekiq_status/server_middleware.rb b/lib/gitlab/sidekiq_status/server_middleware.rb
index 31dfa46ff9da75f500dfb89f02678d761a0fa01a..ceab10b830177f2a4b983278084f0d97a50685f8 100644
--- a/lib/gitlab/sidekiq_status/server_middleware.rb
+++ b/lib/gitlab/sidekiq_status/server_middleware.rb
@@ -4,7 +4,7 @@ module Gitlab
       def call(worker, job, queue)
         ret = yield
 
-        SidekiqStatus.unset(job['jid'])
+        Gitlab::SidekiqStatus.unset(job['jid'])
 
         ret
       end