diff --git a/app/models/concerns/droneable.rb b/app/models/concerns/droneable.rb
index 8f8c5f966..ad5fbcc5f 100644
--- a/app/models/concerns/droneable.rb
+++ b/app/models/concerns/droneable.rb
@@ -17,7 +17,8 @@ module Droneable
   end
 
   def ci_certification?
-    devops_unverified? && Ci::User.exists?(user_login: self.login)
+    return false if self.is_a?(AnonymousUser)
+    devops_unverified? && Ci::User.exists?(user_login: self.login) if @user.devops_unverified?
   end
 
   module ClassMethods
diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder
index f7ff93323..d9aa44025 100644
--- a/app/views/users/get_user_info.json.jbuilder
+++ b/app/views/users/get_user_info.json.jbuilder
@@ -13,4 +13,4 @@ json.user_phone_binded @user.phone.present?
 json.profile_completed @user.profile_completed?
 json.professional_certification @user.professional_certification
 json.devops_step @user.devops_step
-json.ci_certification @user.ci_certification? if !@user.is_a?(AnonymousUser) && @user.devops_unverified?
+json.ci_certification @user.ci_certification?