diff --git a/includes/Elements/Data_Table.php b/includes/Elements/Data_Table.php
index d0164fac8..164a779e2 100755
--- a/includes/Elements/Data_Table.php
+++ b/includes/Elements/Data_Table.php
@@ -1260,12 +1260,11 @@ protected function render( ) {
 	  			$nofollow = !empty($content_row['eael_data_table_content_row_title_link']['nofollow']) ? 'rel="nofollow"' : '';
 
 	  			$table_tr_keys = array_keys( $table_tr );
-				  $last_key = end( $table_tr_keys );
-
+	  			$last_key = end( $table_tr_keys );
 				$tbody_content = ($content_row['eael_data_table_content_type'] == 'editor') ? $content_row['eael_data_table_content_row_content'] : Helper::eael_wp_kses($content_row['eael_data_table_content_row_title']);
 
 	  			$table_td[] = [
-	  				'row_id'		=> $table_tr[$last_key]['id'],
+	  				'row_id'		=> !empty( $table_tr[$last_key]['id'] ) ? $table_tr[$last_key]['id'] : $row_id,
 	  				'type'			=> $content_row['eael_data_table_content_row_type'],
 					'content_type'	=> $content_row['eael_data_table_content_type'],
 					'template'		=> $content_row['eael_primary_templates_for_tables'],