diff --git a/app/logical/popular_search_service.rb b/app/logical/popular_search_service.rb
index cb1b84b53..ef5520cba 100644
--- a/app/logical/popular_search_service.rb
+++ b/app/logical/popular_search_service.rb
@@ -19,6 +19,10 @@ class PopularSearchService
     fetch_data.to_s.scan(/(.+?) (\d+)\.0\n/).slice(0, limit).each(&block)
   end
 
+  def tags
+    fetch_data.to_s.scan(/(.+?) (\d+)\.0\n/).map {|x| x[0]}
+  end
+
   def fetch_data
     dates = date.strftime("%Y-%m-%d")
 
diff --git a/app/presenters/post_set_presenters/post.rb b/app/presenters/post_set_presenters/post.rb
index d5a62f68e..45f2140a3 100644
--- a/app/presenters/post_set_presenters/post.rb
+++ b/app/presenters/post_set_presenters/post.rb
@@ -32,7 +32,11 @@ module PostSetPresenters
     end
 
     def popular_tags
-      Tag.trending
+      if PopularSearchService.enabled?
+        PopularSearchService.new(Date.today, "day").tags.slice(0, 25)
+      else
+        Tag.trending
+      end
     end
 
     def pattern_tags