diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb
index 576ed8cc6..9e3af3e9e 100644
--- a/app/views/proposals/_notifications.html.erb
+++ b/app/views/proposals/_notifications.html.erb
@@ -1,6 +1,8 @@
-<div>
-  <% @notifications.each do |notification| %>
-    <div><%= notification.title %></div>
-    <div><%= notification.body %></div>
-  <% end %>
-</div>
\ No newline at end of file
+<% if @notifications.present? %>
+  <div>
+    <% @notifications.each do |notification| %>
+      <div><%= notification.title %></div>
+      <div><%= notification.body %></div>
+    <% end %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb
index 1662475b1..3046c6ab5 100644
--- a/spec/features/proposal_notifications_spec.rb
+++ b/spec/features/proposal_notifications_spec.rb
@@ -17,7 +17,7 @@ feature 'Proposal Notifications' do
 
     fill_in 'proposal_notification_title', with: "Thank you for supporting my proposal"
     fill_in 'proposal_notification_body', with: "Please share it with others so we can make it happen!"
-    click_button "Send"
+    click_button "Send message"
 
     expect(page).to have_content "Your message has been sent correctly."
     expect(page).to have_content "Thank you for supporting my proposal"
@@ -66,7 +66,7 @@ feature 'Proposal Notifications' do
     proposal = create(:proposal)
 
     visit new_proposal_notification_path(proposal_id: proposal.id)
-    click_button "Send"
+    click_button "Send message"
 
     expect(page).to have_content error_message
   end