diff --git a/app/contracts/projects/base_contract.rb b/app/contracts/projects/base_contract.rb
index 3632870b975..8b8fa191161 100644
--- a/app/contracts/projects/base_contract.rb
+++ b/app/contracts/projects/base_contract.rb
@@ -67,7 +67,7 @@ module Projects
       if user.admin?
         model.available_custom_fields
       else
-        model.available_custom_fields.select(&:visible?)
+        model.available_custom_fields.reject(&:admin_only?)
       end
     end
 
diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb
index 72087aeb475..5208e36cc60 100644
--- a/app/models/custom_value.rb
+++ b/app/models/custom_value.rb
@@ -42,7 +42,7 @@ class CustomValue < ApplicationRecord
            to: :strategy
 
   delegate :editable?,
-           :visible?,
+           :admin_only?,
            :required?,
            :max_length,
            :min_length,
diff --git a/lib/api/v3/utilities/custom_field_injector.rb b/lib/api/v3/utilities/custom_field_injector.rb
index 056024dc1b9..84a71ddc146 100644
--- a/lib/api/v3/utilities/custom_field_injector.rb
+++ b/lib/api/v3/utilities/custom_field_injector.rb
@@ -385,7 +385,7 @@ module API
             custom_fields = if current_user.admin?
                               represented.available_custom_fields
                             else
-                              represented.available_custom_fields.select(&:visible?)
+                              represented.available_custom_fields.reject(&:admin_only?)
                             end
 
             custom_field_class(custom_fields)
diff --git a/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb
index 351f0b475f7..68a790884cb 100644
--- a/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb
+++ b/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb
@@ -168,7 +168,7 @@ module Redmine
         end
 
         def visible_custom_field_values
-          custom_field_values.select(&:visible?)
+          custom_field_values.reject(&:admin_only?)
         end
 
         def custom_value_for(c)