diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 6a0a141..51107b6 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -552,13 +552,13 @@ function template_preprocess_views_view_table(&$variables) {
     if (!empty($options['info'][$field]['empty_column'])) {
       $empty = TRUE;
       foreach ($variables['rows'] as $columns) {
-        $empty &= empty($columns[$column]);
+        $empty &= empty($columns['columns'][$column]['content']);
       }
       if ($empty) {
         foreach ($variables['rows'] as &$column_items) {
-          unset($column_items[$column]);
-          unset($variables['header'][$column]);
+          unset($column_items['columns'][$column]);
         }
+        unset($variables['header'][$column]);
       }
     }
   }