diff --git a/app/models/tag_cloud.rb b/app/models/tag_cloud.rb
index a8f53548a..086d88c48 100644
--- a/app/models/tag_cloud.rb
+++ b/app/models/tag_cloud.rb
@@ -24,7 +24,7 @@ class TagCloud
   end
 
   def resource_model_scoped
-    scope ? resource_model.search(scope) : resource_model
+    scope && resource_model == Proposal ? resource_model.search(scope) : resource_model
   end
 
   def default_blacklist
diff --git a/spec/models/tag_cloud_spec.rb b/spec/models/tag_cloud_spec.rb
index 5fb8fbb42..d040c0527 100644
--- a/spec/models/tag_cloud_spec.rb
+++ b/spec/models/tag_cloud_spec.rb
@@ -79,6 +79,9 @@ describe TagCloud do
       expect(tag_names(tag_cloud)).to contain_exactly('parks')
     end
 
+    xit "returns tags scoped by category for debates"
+    xit "returns tags scoped by geozone for debates"
+
     it "orders tags by count" do
       3.times { create(:proposal, tag_list: 'participation') }
       create(:proposal, tag_list: 'corruption')