diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb
index cc24ad651..c4c49a4aa 100644
--- a/app/views/budgets/investments/_form.html.erb
+++ b/app/views/budgets/investments/_form.html.erb
@@ -23,9 +23,11 @@
       </div>
     <% end %>
 
-    <div class="documents small-12 column">
-      <%= render 'documents/nested_documents', documentable: @investment, f: f %>
-    </div>
+    <% if feature?(:allow_attached_documents) %>
+      <div class="documents small-12 column">
+        <%= render 'documents/nested_documents', documentable: @investment, f: f %>
+      </div>
+    <% end %>
 
     <% if feature?(:map) %>
       <div class="small-12 column">
diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb
index 18694e6ce..2ca4af278 100644
--- a/app/views/budgets/investments/_investment_show.html.erb
+++ b/app/views/budgets/investments/_investment_show.html.erb
@@ -51,9 +51,11 @@
         </p>
       <% end %>
 
-      <%= render 'documents/documents',
-                  documents: investment.documents,
-                  max_documents_allowed: Budget::Investment.max_documents_allowed %>
+      <% if feature?(:allow_attached_documents) %>
+        <%= render 'documents/documents',
+                    documents: investment.documents,
+                    max_documents_allowed: Budget::Investment.max_documents_allowed %>
+      <% end %>
 
       <%= render 'shared/tags', taggable: investment %>
 
diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb
index a2d0c5ab7..1867644ca 100644
--- a/app/views/legislation/proposals/show.html.erb
+++ b/app/views/legislation/proposals/show.html.erb
@@ -80,9 +80,11 @@
 
         <h4><%= @proposal.question %></h4>
 
-        <%= render 'documents/documents',
-                    documents: @proposal.documents,
-                    max_documents_allowed: Proposal.max_documents_allowed %>
+        <% if feature?(:allow_attached_documents) %>
+          <%= render 'documents/documents',
+                      documents: @proposal.documents,
+                      max_documents_allowed: Proposal.max_documents_allowed %>
+        <% end %>
 
         <%= render 'shared/tags', taggable: @proposal %>
 
diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb
index 6bf8c274a..f60397b17 100644
--- a/app/views/proposals/_form.html.erb
+++ b/app/views/proposals/_form.html.erb
@@ -52,9 +52,11 @@
       </div>
     <% end %>
 
-    <div class="documents small-12 column">
-      <%= render 'documents/nested_documents', documentable: @proposal, f: f %>
-    </div>
+    <% if feature?(:allow_attached_documents) %>
+      <div class="documents small-12 column">
+        <%= render 'documents/nested_documents', documentable: @proposal, f: f %>
+      </div>
+    <% end %>
 
     <div class="small-12 medium-6 column">
       <%= f.label :geozone_id,  t("proposals.form.geozone") %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 3355251fc..21f4f0e58 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -106,9 +106,11 @@
           </div>
         <% end %>
 
-        <%= render 'documents/documents',
-                    documents: @proposal.documents,
-                    max_documents_allowed: Proposal.max_documents_allowed %>
+        <% if feature?(:allow_attached_documents) %>
+          <%= render 'documents/documents',
+                      documents: @proposal.documents,
+                      max_documents_allowed: Proposal.max_documents_allowed %>
+        <% end %>
 
         <%= render 'shared/tags', taggable: @proposal %>
 
diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml
index 531393e65..359e08ca9 100644
--- a/config/locales/en/settings.yml
+++ b/config/locales/en/settings.yml
@@ -45,6 +45,7 @@ en:
       community: Community on proposals and investments
       map: Proposals and budget investments geolocation
       allow_images: Allow upload and show images
+      allow_attached_documents: Allow upload and show of attached documents
     map_latitude: Latitude
     map_longitude: Longitude
     map_zoom: Zoom
diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml
index d374726c5..5b137b23a 100644
--- a/config/locales/es/settings.yml
+++ b/config/locales/es/settings.yml
@@ -45,6 +45,7 @@ es:
       community: Comunidad en propuestas y proyectos de gasto
       map: Geolocalización de propuestas y proyectos de gasto
       allow_images: Permitir subir y mostrar imágenes
+      allow_attached_documents: Permitir creación de documentos adjuntos
     map_latitude: Latitud
     map_longitude: Longitud
     map_zoom: Zoom
diff --git a/db/dev_seeds/settings.rb b/db/dev_seeds/settings.rb
index 4551f9bee..61e5ec73c 100644
--- a/db/dev_seeds/settings.rb
+++ b/db/dev_seeds/settings.rb
@@ -43,6 +43,7 @@ section "Creating Settings" do
   Setting.create(key: 'feature.community', value: "true")
   Setting.create(key: 'feature.map', value: "true")
   Setting.create(key: 'feature.allow_images', value: "true")
+  Setting.create(key: 'feature.allow_attached_documents', value: "true")
   Setting.create(key: 'feature.public_stats', value: "true")
   Setting.create(key: 'feature.guides', value: nil)
 
diff --git a/db/seeds.rb b/db/seeds.rb
index 844a24d81..6367734ab 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -85,6 +85,7 @@ Setting['feature.user.recommendations'] = true
 Setting['feature.community'] = true
 Setting['feature.map'] = nil
 Setting['feature.allow_images'] = true
+Setting['feature.allow_attached_documents'] = true
 Setting['feature.guides'] = nil
 
 # Spending proposals feature flags
diff --git a/lib/tasks/settings.rake b/lib/tasks/settings.rake
index 29dc256bb..d09d32527 100644
--- a/lib/tasks/settings.rake
+++ b/lib/tasks/settings.rake
@@ -8,4 +8,9 @@ namespace :settings do
     per_page_code_setting.destroy if per_page_code_setting.present?
   end
 
+  desc "Create new Attached Documents feature setting"
+  task create_attached_documents_setting: :environment do
+    Setting['feature.allow_attached_documents'] = true
+  end
+
 end
diff --git a/spec/shared/features/documentable.rb b/spec/shared/features/documentable.rb
index 16fab74ce..7fe0dd146 100644
--- a/spec/shared/features/documentable.rb
+++ b/spec/shared/features/documentable.rb
@@ -68,6 +68,23 @@ shared_examples "documentable" do |documentable_factory_name,
 
     end
 
+    describe "When allow attached documents setting is disabled" do
+      before do
+        Setting['feature.allow_attached_documents'] = false
+      end
+
+      after do
+        Setting['feature.allow_attached_documents'] = true
+      end
+
+      scenario "Documents list should not be available" do
+        login_as(create(:user))
+        visit send(documentable_path, arguments)
+
+        expect(page).not_to have_css("#documents")
+      end
+    end
+
   end
 
   context "Destroy" do
diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb
index 9873772f3..1a47cc503 100644
--- a/spec/shared/features/nested_documentable.rb
+++ b/spec/shared/features/nested_documentable.rb
@@ -285,6 +285,23 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na
 
     end
 
+    describe "When allow attached documents setting is disabled" do
+      before do
+        Setting['feature.allow_attached_documents'] = false
+      end
+
+      after do
+        Setting['feature.allow_attached_documents'] = true
+      end
+
+      scenario "Add new document button should not be available" do
+        login_as user_to_login
+        visit send(path, arguments)
+
+        expect(page).not_to have_content("Add new document")
+      end
+    end
+
   end
 
 end