diff --git a/includes/theme.inc b/includes/theme.inc
index 9fc7d0c558..c9d80584b5 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -2115,9 +2115,6 @@ function theme_table(array $variables) {
     $no_striping = $tag === 'tfoot';
 
     foreach ($content as $number => $row) {
-      $cells = $row;
-      $attributes = array();
-
       // Check if we're dealing with a simple or complex row.
       if (isset($row['data'])) {
         $cells = $row['data'];
@@ -2129,6 +2126,11 @@ function theme_table(array $variables) {
         unset($attributes['data']);
         unset($attributes['no_striping']);
       }
+      else {
+        $cells = $row;
+        $attributes = array();
+        $no_striping = FALSE;
+      }
 
       if (!empty($cells)) {
         // Add odd/even class.