diff --git a/app/models/project_folder.rb b/app/models/project_folder.rb
index 3d71bcb7c..f529f7c0e 100644
--- a/app/models/project_folder.rb
+++ b/app/models/project_folder.rb
@@ -7,11 +7,8 @@ class ProjectFolder < ApplicationRecord
 
   validates :name,
             length: { minimum: Constants::NAME_MIN_LENGTH,
-                      maximum: Constants::NAME_MAX_LENGTH }
-  validates :name, uniqueness: { scope: %i(team_id parent_folder_id), case_sensitive: false },
-                   if: -> { parent_folder.present? }
-  validates :name, uniqueness: { scope: %i(team_id archived), case_sensitive: false },
-                   if: -> { parent_folder.blank? }
+                      maximum: Constants::NAME_MAX_LENGTH },
+            uniqueness: { scope: %i(team_id parent_folder_id archived), case_sensitive: false }
   validate :parent_folder_team, if: -> { parent_folder.present? }
   validate :parent_folder_validation, if: -> { parent_folder.present? }