Ticket #20633: 20633.diff

wp-includes/comment.php

@@ -752 +752 @@
         if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
                 return $wp_query->max_num_comment_pages;
 
-        if ( !$comments || !is_array($comments) )
+        if ( ( !$comments || !is_array($comments) ) && !empty( $wp_query->comments ) )
                 $comments = $wp_query->comments;
 
         if ( empty($comments) )