diff --git a/app/views/proposals/_comments.html.erb b/app/views/proposals/_comments.html.erb
index 094814cf1..ed52b1b66 100644
--- a/app/views/proposals/_comments.html.erb
+++ b/app/views/proposals/_comments.html.erb
@@ -2,13 +2,6 @@
   <section class="comments">
     <div class="row">
       <div id="comments" class="small-12 column">
-        <% if @notifications.blank? %>
-          <h2>
-            <%= t("proposals.show.comments_title") %>
-            <span class="js-comments-count">(<%= @proposal.comments_count %>)</span>
-          </h2>
-        <% end %>
-
         <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
 
         <% if user_signed_in? %>
diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb
index 44bb9f4a2..69389b2c5 100644
--- a/app/views/proposals/_notifications.html.erb
+++ b/app/views/proposals/_notifications.html.erb
@@ -1,6 +1,12 @@
 <div class="tabs-panel" id="tab-notifications">
   <div class="row">
     <div class="small-12 column">
+      <% if @notifications.blank? %>
+        <div class="callout primary text-center">
+          <%= t('proposals.show.no_notifications') %>
+        </div>
+      <% end %>
+
       <% @notifications.each do |notification| %>
         <h3><%= notification.title %></h3>
         <p class="more-info"><%= notification.created_at.to_date %></p>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 7bb2a92a6..3a9869d83 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -124,10 +124,8 @@
 <% end %>
 
 <div class="tabs-content" data-tabs-content="example-tabs">
-  <% if @notifications.present? %>
-    <%= render "proposals/filter_subnav" %>
-    <%= render "proposals/notifications" %>
-  <% end %>
+  <%= render "proposals/filter_subnav" %>
+  <%= render "proposals/notifications" %>
 
   <div class="tabs-panel is-active" id="tab-comments">
     <%= render "proposals/comments" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 78ac956a7..65d97f997 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -356,7 +356,6 @@ en:
         other: "%{count} comments"
         zero: No comments
       comments_tab: Comments
-      comments_title: Comments
       edit_proposal_link: Edit
       flag: This proposal has been flagged as inappropriate by several users.
       login_to_comment: You must %{signin} or %{signup} to leave a comment.
@@ -366,6 +365,7 @@ en:
       retired: Proposal retired by the author
       share: Share
       send_notification: Send notification
+      no_notifications: "This proposal has any notifications."
     update:
       form:
         submit_button: Save changes
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 219a07dee..9ac646584 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -356,7 +356,6 @@ es:
         other: "%{count} Comentarios"
         zero: Sin comentarios
       comments_tab: Comentarios
-      comments_title: Comentarios
       edit_proposal_link: Editar propuesta
       flag: Esta propuesta ha sido marcada como inapropiada por varios usuarios.
       login_to_comment: Necesitas %{signin} o %{signup} para comentar.
@@ -366,6 +365,7 @@ es:
       retired: Propuesta retirada por el autor
       send_notification: Enviar notificación
       share: Compartir
+      no_notifications: "Esta propuesta no tiene notificaciones."
     update:
       form:
         submit_button: Guardar cambios