diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index c4ecba7c87f..2223dc6ad73 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -69,6 +69,9 @@ class TopicList < DraftableList
       else
         "topic_list_#{@category.url.sub(/^\//, '')}/l/#{@filter}"
       end
+    elsif @tags
+      tag = @tags.first
+      "topic_list_tag/#{tag.name}/l/#{@filter}"
     else
       "topic_list_#{@filter}"
     end
diff --git a/spec/models/topic_list_spec.rb b/spec/models/topic_list_spec.rb
index f731bdce5fd..8f2ea2b5ab7 100644
--- a/spec/models/topic_list_spec.rb
+++ b/spec/models/topic_list_spec.rb
@@ -93,6 +93,7 @@ describe TopicList do
 
   describe "#preload_key" do
     let(:category) { Fabricate(:category) }
+    let(:tag) { Fabricate(:tag) }
 
     it "generates correct key for categories" do
       topic_list = TopicList.new('latest', nil, nil, category: category, category_id: category.id)
@@ -103,5 +104,10 @@ describe TopicList do
       topic_list = TopicList.new('latest', nil, nil, category: category, category_id: category.id, no_subcategories: true)
       expect(topic_list.preload_key).to eq("topic_list_c/#{category.slug}/#{category.id}/none/l/latest")
     end
+
+    it "generates correct key for tag" do
+      topic_list = TopicList.new('latest', nil, nil, tags: [tag])
+      expect(topic_list.preload_key).to eq("topic_list_tag/#{tag.name}/l/latest")
+    end
   end
 end