diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 2241ad8552..e0bf2d3e92 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -1012,9 +1012,10 @@ class Walker {
 		}
 
 		$total_top = count( $top_level_elements );
-
 		if ( $paging )
 			$this->max_pages = ceil($total_top / $per_page);
+		else
+			$end = $total_top;
 
 		foreach( $top_level_elements as $e ){
 			$count++;
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index a8db29d69f..4f53d9a309 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1015,6 +1015,7 @@ function wp_list_comments($args = array(), $comments = null ) {
 		$r['per_page'] = get_query_var('comments_per_page');
 
 	if ( empty($r['per_page']) ) {
+		$r['per_page'] = 0;
 		$r['page'] = 0;
 	} else {
 		$r['page'] = intval($r['page']);