diff --git a/includes/classes/Indexable/Comment/Comment.php b/includes/classes/Indexable/Comment/Comment.php
index a96b5549f5..d6ca3297ec 100644
--- a/includes/classes/Indexable/Comment/Comment.php
+++ b/includes/classes/Indexable/Comment/Comment.php
@@ -85,6 +85,9 @@ public function format_args( $query_vars ) {
 		 */
 		if ( isset( $query_vars['offset'] ) ) {
 			$formatted_args['from'] = (int) $query_vars['offset'];
+			if ( empty( $query_vars['number'] ) ) {
+				$formatted_args['size'] -= (int) $formatted_args['from'];
+			}
 		}
 
 		/**