diff --git a/CHANGES.txt b/CHANGES.txt
index 6b40d9d5a89..5883f0bb564 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -146,6 +146,8 @@ Release 0.21.0 - Unreleased
                an immediate region server shutdown (Sam Pullara via JD)
    HBASE-2078  Add JMX settings as commented out lines to hbase-env.sh
                (Lars George via JD)
+   HBASE-2082  TableInputFormat is ignoring input scan's stop row setting
+               (Scott Wang via Andrew Purtell)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java b/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
index d8c78e6d924..e2c562a6f66 100644
--- a/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
+++ b/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
@@ -293,8 +293,9 @@ extends InputFormat<ImmutableBytesWritable, Result> {
         byte[] splitStart = startRow.length == 0 || 
           Bytes.compareTo(keys.getFirst()[i], startRow) >= 0 ? 
             keys.getFirst()[i] : startRow;
-        byte[] splitStop = stopRow.length == 0 || 
-          Bytes.compareTo(keys.getSecond()[i], stopRow) <= 0 ? 
+        byte[] splitStop = (stopRow.length == 0 || 
+          Bytes.compareTo(keys.getSecond()[i], stopRow) <= 0) &&
+          keys.getSecond()[i].length > 0 ? 
             keys.getSecond()[i] : stopRow;
         InputSplit split = new TableSplit(table.getTableName(),
           splitStart, splitStop, regionLocation);