diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml
index 1db32379df3f5c0e74365383827b1f3bcbd81dcf..05ddd0ec733c6be3e7acbabb75ce33870267c0b4 100644
--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
@@ -1,6 +1,8 @@
 .flash-container.flash-container-page
   -# We currently only support `alert`, `notice`, `success`
   - flash.each do |key, value|
-    %div{ class: "flash-#{key}" }
-      %div{ class: (container_class) }
-        %span= value
+    -# Don't show a flash message if the message is nil
+    - if value
+      %div{ class: "flash-#{key}" }
+        %div{ class: (container_class) }
+          %span= value
diff --git a/spec/features/logout_spec.rb b/spec/features/logout_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..635729efa53de5de3cc19667ee64e5428699e65b
--- /dev/null
+++ b/spec/features/logout_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'Logout/Sign out', :js do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+    visit root_path
+  end
+
+  it 'sign out redirects to sign in page' do
+    gitlab_sign_out
+
+    expect(current_path).to eq new_user_session_path
+  end
+
+  it 'sign out does not show signed out flash notice' do
+    gitlab_sign_out
+
+    expect(page).not_to have_selector('.flash-notice')
+  end
+end