diff --git a/app/controllers/projects/settings/custom_fields_controller.rb b/app/controllers/projects/settings/custom_fields_controller.rb
index ffd9d0b6244d..8c8009fc8983 100644
--- a/app/controllers/projects/settings/custom_fields_controller.rb
+++ b/app/controllers/projects/settings/custom_fields_controller.rb
@@ -30,7 +30,9 @@ class Projects::Settings::CustomFieldsController < Projects::SettingsController
   menu_item :settings_custom_fields
 
   def show
-    @wp_custom_fields = WorkPackageCustomField.order("lower(name)")
+    @wp_custom_fields = WorkPackageCustomField
+                          .order("lower(name)")
+                          .where.not(field_format: "hierarchy") # TODO: Remove after enabling hierarchy fields
   end
 
   def update
diff --git a/app/models/type/attributes.rb b/app/models/type/attributes.rb
index 61a0cc8f3c8c..e9e14b85d172 100644
--- a/app/models/type/attributes.rb
+++ b/app/models/type/attributes.rb
@@ -146,7 +146,9 @@ def merge_date_for_form_attributes(attributes)
     end
 
     def add_custom_fields_to_form_attributes(attributes)
-      WorkPackageCustomField.includes(:custom_options).all.find_each do |field|
+      WorkPackageCustomField.includes(:custom_options)
+                            .where.not(field_format: "hierarchy") # TODO: Remove after enabling hierarchy fields
+                            .find_each do |field|
         attributes[field.attribute_name] = {
           required: field.is_required,
           has_default: field.default_value.present?,