diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java
index 1feafc18993f..0e525d246a2a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java
@@ -93,9 +93,12 @@ public ClientSideRegionScanner(Configuration conf, FileSystem fs,
   @Override
   public Result next() throws IOException {
     values.clear();
-    scanner.nextRaw(values);
-    if (values.isEmpty()) {
-      //we are done
+    boolean moreValues;
+    do {
+      moreValues = scanner.nextRaw(values);
+    } while (values.isEmpty() && moreValues);
+
+    if (!moreValues) {
       return null;
     }