diff --git a/CHANGES.txt b/CHANGES.txt
index 072117cbd2..80a6d0d671 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -45,6 +45,7 @@ Merged from 2.0:
    to the coordinator (CASSANDRA-7599)
  * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
  * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
+ * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)
diff --git a/bin/cqlsh b/bin/cqlsh
index b733322988..1b682f064e 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -932,8 +932,9 @@ class Shell(cmd.Cmd):
         self.decoding_errors = []
 
         self.writeresult("")
+        if rows:
+            rows = list(rows)  # this may be an iterator if the result is large enough to page
         self.print_static_result(rows, cfMetaData)
-
         self.writeresult("(%d rows)" % len(rows or []))
 
         if self.decoding_errors: