diff --git a/spec/models/projects/customizable_spec.rb b/spec/models/projects/customizable_spec.rb
index b49e91ea23b1..15f703321890 100644
--- a/spec/models/projects/customizable_spec.rb
+++ b/spec/models/projects/customizable_spec.rb
@@ -39,9 +39,10 @@
   let!(:list_custom_field) do
     create(:list_project_custom_field, project_custom_field_section: section)
   end
+  let(:user) { build_stubbed(:admin) }
 
   before do
-    allow(User).to receive(:current).and_return build_stubbed(:admin)
+    allow(User).to receive(:current).and_return user
   end
 
   context "when not persisted" do
@@ -78,6 +79,35 @@
         expect(project.available_custom_fields)
           .to contain_exactly(bool_custom_field)
       end
+
+      context "when the same custom field is activated in multiple projects a user is member of " \
+              "and they only have view_project_attributes permission in one of the project" do
+        let(:other_project) { create(:project) }
+        let!(:project_cf) do
+          # This custom field is enabled in both project and other_project to test that there is no
+          # bleeding of enabled custom fields between 2 projects.
+          create(:project_custom_field_project_mapping, project:).project_custom_field.tap do |pcf|
+            create(:project_custom_field_project_mapping,
+                   project: other_project,
+                   project_custom_field: pcf)
+          end
+        end
+
+        let(:user) do
+          create(:user, member_with_permissions: {
+                   project => [],
+                   other_project => %i(view_project_attributes)
+                 })
+        end
+
+        it "returns available_custom_fields only for the other_project" do
+          expect(project.available_custom_fields)
+            .to be_empty
+
+          expect(other_project.available_custom_fields)
+            .to contain_exactly(project_cf)
+        end
+      end
     end
 
     describe "#custom_field_values and #custom_value_for" do
diff --git a/spec/requests/api/v3/projects/index_resource_spec.rb b/spec/requests/api/v3/projects/index_resource_spec.rb
index 78e71fb5f6bc..6f14b88f43b0 100644
--- a/spec/requests/api/v3/projects/index_resource_spec.rb
+++ b/spec/requests/api/v3/projects/index_resource_spec.rb
@@ -410,11 +410,11 @@
       shared_let(:project_cf) do
         # This custom field is enabled in both project and other_project to test that there is no
         # bleeding of enabled custom fields between 2 projects.
-        pcf = create(:project_custom_field_project_mapping, project:).project_custom_field
-        create(:project_custom_field_project_mapping,
-               project: other_project,
-               project_custom_field: pcf)
-        pcf
+        create(:project_custom_field_project_mapping, project:).project_custom_field.tap do |pcf|
+          create(:project_custom_field_project_mapping,
+                 project: other_project,
+                 project_custom_field: pcf)
+        end
       end
       shared_let(:public_cf) do
         create(:project_custom_field_project_mapping, project: public_project).project_custom_field