diff --git a/app/helpers/flags_helper.rb b/app/helpers/flags_helper.rb
index 715937c0f..b5ba67f41 100644
--- a/app/helpers/flags_helper.rb
+++ b/app/helpers/flags_helper.rb
@@ -26,4 +26,4 @@ module FlagsHelper
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb
index b26db7263..501b262e6 100644
--- a/app/views/budgets/investments/_investment_show.html.erb
+++ b/app/views/budgets/investments/_investment_show.html.erb
@@ -13,10 +13,12 @@
         <%= l investment.created_at.to_date %>
         <span class="bullet">&nbsp;&bull;&nbsp;</span>
         <%= investment.heading.name %>
-        <span class="bullet">&nbsp;&bull;&nbsp;</span>
-        <span class="js-follow">
+
+        <% if current_user %>
+          <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <%= render 'follows/followable_button', followable: investment %>
-        </span>
+        <% end %>
+
       </div>
 
       <br>
diff --git a/app/views/follows/_followable_button.html.erb b/app/views/follows/_followable_button.html.erb
index e54d524c1..94df2c6ad 100644
--- a/app/views/follows/_followable_button.html.erb
+++ b/app/views/follows/_followable_button.html.erb
@@ -1,37 +1,39 @@
-<span class="followable-content">
+<span class="js-follow">
+  <span class="followable-content">
 
-  <% if show_follow_action? followable %>
-    <%= link_to "##{follow_link_wrapper_id(followable)}",
-                id: follow_link_wrapper_id(followable),
-                title: follow_entity_text(followable),
-                data: { toggle: follow_drop_id(followable) } do %>
-      <%= t('shared.follow') %>
+    <% if show_follow_action? followable %>
+      <%= link_to "##{follow_link_wrapper_id(followable)}",
+                  id: follow_link_wrapper_id(followable),
+                  title: follow_entity_text(followable),
+                  data: { toggle: follow_drop_id(followable) } do %>
+        <%= t('shared.follow') %>
+      <% end %>
+      <div class="dropdown-pane" id="<%= follow_drop_id(followable) %>"
+           data-dropdown data-auto-focus="true">
+        <%= link_to follow_entity_text(followable),
+                    follows_path(followable_id: followable.id,
+                                 followable_type: followable.class.name),
+                    method: :post, remote: true,
+                    id: follow_link_id(followable) %>
+      </div>
     <% end %>
-    <div class="dropdown-pane" id="<%= follow_drop_id(followable) %>"
-         data-dropdown data-auto-focus="true">
-      <%= link_to follow_entity_text(followable),
-                  follows_path(followable_id: followable.id,
-                               followable_type: followable.class.name),
-                  method: :post, remote: true,
-                  id: follow_link_id(followable) %>
-    </div>
-  <% end %>
 
-  <% if show_unfollow_action? followable %>
-    <% follow = followable.follows.where(user: current_user).first %>
-    <%= link_to "##{unfollow_link_wrapper_id(followable)}",
-                id: unfollow_link_wrapper_id(followable),
-                title: unfollow_entity_text(followable),
-                data: { toggle: unfollow_drop_id(followable) } do %>
-      <%= t('shared.unfollow') %>
+    <% if show_unfollow_action? followable %>
+      <% follow = followable.follows.where(user: current_user).first %>
+      <%= link_to "##{unfollow_link_wrapper_id(followable)}",
+                  id: unfollow_link_wrapper_id(followable),
+                  title: unfollow_entity_text(followable),
+                  data: { toggle: unfollow_drop_id(followable) } do %>
+        <%= t('shared.unfollow') %>
+      <% end %>
+      <div class="dropdown-pane" id="<%= unfollow_drop_id(followable) %>"
+           data-dropdown data-auto-focus="true">
+        <%= link_to unfollow_entity_text(followable),
+                    follow_path(follow),
+                    method: :delete, remote: true,
+                    id: unfollow_link_id(followable) %>
+      </div>
     <% end %>
-    <div class="dropdown-pane" id="<%= unfollow_drop_id(followable) %>"
-         data-dropdown data-auto-focus="true">
-      <%= link_to unfollow_entity_text(followable),
-                  follow_path(follow),
-                  method: :delete, remote: true,
-                  id: unfollow_link_id(followable) %>
-    </div>
-  <% end %>
 
-</span>
+  </span>
+</span>
\ No newline at end of file
diff --git a/app/views/proposals/_flag_actions.html.erb b/app/views/proposals/_flag_actions.html.erb
index aba7a2423..875a23f07 100644
--- a/app/views/proposals/_flag_actions.html.erb
+++ b/app/views/proposals/_flag_actions.html.erb
@@ -1,19 +1,21 @@
-<span class="flag-content">
-  <% if show_flag_action? proposal %>
-    <a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
-      <span class="icon-flag flag-disable"></span>
-    </a>
-    <div class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
-      <%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %>
-    </div>
-  <% end %>
+<span class="js-flag-actions">
+  <span class="flag-content">
+    <% if show_flag_action? proposal %>
+      <a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
+        <span class="icon-flag flag-disable"></span>
+      </a>
+      <div class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
+        <%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %>
+      </div>
+    <% end %>
 
-  <% if show_unflag_action? proposal %>
-    <a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.unflag') %>">
-      <span class="icon-flag flag-active"></span>
-    </a>
-    <div class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
-      <%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %>
-    </div>
-  <% end %>
+    <% if show_unflag_action? proposal %>
+      <a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.unflag') %>">
+        <span class="icon-flag flag-active"></span>
+      </a>
+      <div class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
+        <%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %>
+      </div>
+    <% end %>
+  </span>
 </span>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index c82503f27..00c1cd17e 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -49,14 +49,15 @@
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <span class="icon-comments"></span>&nbsp;
           <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
-          <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <span class="js-flag-actions">
+
+          <% if current_user %>
+            <span class="bullet">&nbsp;&bull;&nbsp;</span>
             <%= render 'proposals/flag_actions', proposal: @proposal %>
-          </span>
-          <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <span class="js-follow">
+
+            <span class="bullet">&nbsp;&bull;&nbsp;</span>
             <%= render 'follows/followable_button', followable: @proposal %>
-          </span>
+          <% end %>
+
         </div>
 
         <br>
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index 84d8c2611..82700255a 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -329,6 +329,14 @@ feature 'Budget Investments' do
     end
   end
 
+  scenario "Not sow flaggable buttons" do
+    investment = create(:budget_investment, heading: heading)
+
+    visit budget_investment_path(budget_id: budget.id, id: investment.id)
+
+    expect(page).not_to have_selector ".js-follow"
+  end
+
   scenario "Show back link contains heading id" do
     investment = create(:budget_investment, heading: heading)
     visit budget_investment_path(budget, investment)
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 3b95feaa5..395d32133 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -61,6 +61,8 @@ feature 'Proposals' do
     expect(page).to have_content I18n.l(proposal.created_at.to_date)
     expect(page).to have_selector(avatar(proposal.author.name))
     expect(page.html).to include "<title>#{proposal.title}</title>"
+    expect(page).not_to have_selector ".js-flag-actions"
+    expect(page).not_to have_selector ".js-follow"
 
     within('.social-share-button') do
       expect(page.all('a').count).to be(4) # Twitter, Facebook, Google+, Telegram