diff --git a/app/models/tag_cloud.rb b/app/models/tag_cloud.rb
index fdb4c5f6c..a8f53548a 100644
--- a/app/models/tag_cloud.rb
+++ b/app/models/tag_cloud.rb
@@ -12,7 +12,7 @@ class TagCloud
     last_week.tag_counts.
     where("lower(name) NOT IN (?)", category_names + geozone_names + default_blacklist).
     order("#{table_name}_count": :desc, name: :asc).
-    limit(5)
+    limit(10)
   end
 
   def category_names
diff --git a/spec/models/tag_cloud_spec.rb b/spec/models/tag_cloud_spec.rb
index 7f3c0c85d..5fb8fbb42 100644
--- a/spec/models/tag_cloud_spec.rb
+++ b/spec/models/tag_cloud_spec.rb
@@ -100,6 +100,14 @@ describe TagCloud do
       expect(tag_names(tag_cloud).second).to eq 'participation'
       expect(tag_names(tag_cloud).third).to  eq 'corruption'
     end
+
+    it "returns a maximum of 10 tags" do
+      12.times { |i| create(:proposal, tag_list: "Tag #{i}") }
+
+      tag_cloud = TagCloud.new(Proposal)
+
+      expect(tag_names(tag_cloud).count).to eq(10)
+    end
   end
 
 end
\ No newline at end of file