diff --git a/omega/theme/status-messages.theme.inc b/omega/theme/status-messages.theme.inc
index 81630df0aaefb087d77d90c721f3da73a7cff43d..eec09cb09869e8880160eba17a01d07c4936b4eb 100644
--- a/omega/theme/status-messages.theme.inc
+++ b/omega/theme/status-messages.theme.inc
@@ -20,6 +20,9 @@ function omega_status_messages($variables) {
     'warning' => t('Warning message'),
   );
   foreach (drupal_get_messages($display) as $type => $messages) {
+    if (empty($messages)) {
+      continue;
+    }
     $output .= '<div class="messages messages--' . $type . '">';
     if (!empty($status_heading[$type])) {
       $output .= '<h2 class="element-invisible">' . $status_heading[$type] . "</h2>";