diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index c3b7933293..d2ff6e4a00 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -6,11 +6,7 @@
 
 - unless @system_checks.empty?
   .flash-message-stack
-    - @system_checks.each do |message|
-      .flash-message{ class: message.critical ? 'alert' : 'warning' }
-        = t("admin.system_checks.#{message.key}.message_html", value: message.value ? content_tag(:strong, message.value) : nil)
-        - if message.action
-          = link_to t("admin.system_checks.#{message.key}.action"), message.action
+    = render collection: @system_checks, partial: 'admin/system_check/messages/message'
 
 .dashboard
   .dashboard__item
diff --git a/app/views/admin/system_check/messages/_message.html.haml b/app/views/admin/system_check/messages/_message.html.haml
new file mode 100644
index 0000000000..650c2be738
--- /dev/null
+++ b/app/views/admin/system_check/messages/_message.html.haml
@@ -0,0 +1,4 @@
+.flash-message{ class: message.critical ? 'alert' : 'warning' }
+  = t("admin.system_checks.#{message.key}.message_html", value: message.value ? tag.strong(message.value) : nil)
+  - if message.action
+    = link_to t("admin.system_checks.#{message.key}.action"), message.action