diff --git a/lib/prawn/table.rb b/lib/prawn/table.rb
index 8331c6363..4b1b4f16d 100644
--- a/lib/prawn/table.rb
+++ b/lib/prawn/table.rb
@@ -320,7 +320,9 @@ def draw
               c = Cells.new(cells_this_page.map { |ci, _| ci })
               @before_rendering_page.call(c)
             end
-            Cell.draw_cells(cells_this_page)
+            if @header_row.nil? || cells_this_page.size > @header_row.size
+              Cell.draw_cells(cells_this_page)
+            end
             cells_this_page = []
 
             # start a new page or column
diff --git a/spec/table_spec.rb b/spec/table_spec.rb
index 74cfb8a99..f5f2f87f7 100644
--- a/spec/table_spec.rb
+++ b/spec/table_spec.rb
@@ -734,7 +734,7 @@
     end
 
     it 'should only draw first-page header if the first multi-row fits',
-        :unresolved, :issue => 707 do
+        :issue => 707 do
       pdf = Prawn::Document.new
 
       pdf.y = 100 # not enough room for the header and multirow cell