diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 5d12aa837..bf8adbe20 100644
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -10,8 +10,10 @@
 
 <%= render :partial => 'changeset_paging_nav' %>
 
+<% unless params[:friends] or params[:nearby] -%>
 <%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>
 
-<% content_for :head do %>
+<% content_for :head do -%>
 <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
-<% end %>
+<% end -%>
+<% end -%>
diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 03a326d16..9de2efea5 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -34,8 +34,10 @@
   <br />
 <% end %>
 
+<% unless params[:friends] or params[:nearby] -%>
 <%= rss_link_to :action => 'rss', :language => params[:language] %>
 
-<% content_for :head do %>
+<% content_for :head do -%>
 <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
-<% end %>
+<% end -%>
+<% end -%>