diff --git a/tablefield.module b/tablefield.module
index 8f88022..7e30fce 100644
--- a/tablefield.module
+++ b/tablefield.module
@@ -198,8 +198,21 @@ function tablefield_field_formatter_view($entity_type, $entity, $field, $instanc
       // Pull the header for theming
       $header = array_shift($tabledata);
 
+      $noheader = TRUE;
+      foreach ($header as $cell) {
+        if (strlen($cell['data']) > 0) {
+          $noheader = FALSE;
+          break;
+        }
+      }
+
       // Theme the table for display
-      $element[$delta]['#markup'] = theme('tablefield_view', array('header' => $header, 'rows' => $tabledata, 'delta' => $delta));
+      if ($noheader) {
+        $element[$delta]['#markup'] = theme('tablefield_view', array('rows' => $tabledata, 'delta' => $delta));
+      }
+      else {
+        $element[$delta]['#markup'] = theme('tablefield_view', array('header' => $header, 'rows' => $tabledata, 'delta' => $delta));
+      }
     }
 
   }