diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index c9ed0be878f..fe1a48d4382 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -27,7 +27,7 @@
           ]]></description>
           <link><%= topic_url %></link>
           <pubDate><%= topic.created_at.rfc2822 %></pubDate>
-          <guid><%= topic_url %></guid>
+          <guid isPermaLink="false">topic-<%= topic.id %></guid>
           <source url="<%= topic_url %>.rss"><%= topic.title %></source>
         </item>
       <% end %>
diff --git a/app/views/topics/show.rss.erb b/app/views/topics/show.rss.erb
index 67df5fd6568..a20275d0bc9 100644
--- a/app/views/topics/show.rss.erb
+++ b/app/views/topics/show.rss.erb
@@ -30,7 +30,7 @@
         ]]></description>
         <link><%= post_url %></link>
         <pubDate><%= post.created_at.rfc2822 %></pubDate>
-        <guid><%= post_url %></guid>
+        <guid isPermaLink="false">post-<%= post.topic_id %>-<%= post.post_number %></guid>
         <source url="<%= Discourse.base_url %><%= @topic_view.relative_url %>.rss"><%= @topic_view.title %></source>
       </item>
     <% end %>