diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
index 053d56b2da6..3980cce0d5a 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
@@ -999,6 +999,8 @@ abstract class BufferedDataBlockEncoder implements DataBlockEncoder {
       current.tagsBuffer = previous.tagsBuffer;
       current.tagsCompressedLength = previous.tagsCompressedLength;
       current.uncompressTags = false;
+      // The current key has to be reset with the previous Cell
+      current.setKey(current.keyBuffer, current.memstoreTS);
       previous.invalidate();
     }
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestSeekBeforeWithReverseScan.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestSeekBeforeWithReverseScan.java
new file mode 100644
index 00000000000..2826694bb66
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestSeekBeforeWithReverseScan.java
@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.io.encoding;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
+import org.apache.hadoop.hbase.regionserver.Region;
+import org.apache.hadoop.hbase.regionserver.RegionScanner;
+import org.apache.hadoop.hbase.testclassification.IOTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category({ IOTests.class, SmallTests.class })
+public class TestSeekBeforeWithReverseScan {
+  private final HBaseTestingUtility testUtil = new HBaseTestingUtility();
+
+  private Region region;
+
+  private byte[] cfName = Bytes.toBytes("a");
+  private byte[] cqName = Bytes.toBytes("b");
+
+  @Before
+  public void setUp() throws Exception {
+    TableName tableName = TableName.valueOf(getClass().getSimpleName());
+    HTableDescriptor htd = new HTableDescriptor(tableName);
+    htd.addFamily(new HColumnDescriptor(cfName).setDataBlockEncoding(DataBlockEncoding.FAST_DIFF));
+    HRegionInfo info = new HRegionInfo(tableName, null, null, false);
+    Path path = testUtil.getDataTestDir(getClass().getSimpleName());
+    region = HBaseTestingUtility.createRegionAndWAL(info, path, testUtil.getConfiguration(), htd);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    HBaseTestingUtility.closeRegionAndWAL(region);
+    testUtil.cleanupTestDir();
+  }
+
+  @Test
+  public void testReverseScanWithoutPadding() throws Exception {
+    byte[] row1 = Bytes.toBytes("a");
+    byte[] row2 = Bytes.toBytes("ab");
+    byte[] row3 = Bytes.toBytes("b");
+
+    Put put1 = new Put(row1);
+    put1.addColumn(cfName, cqName, HConstants.EMPTY_BYTE_ARRAY);
+    Put put2 = new Put(row2);
+    put2.addColumn(cfName, cqName, HConstants.EMPTY_BYTE_ARRAY);
+    Put put3 = new Put(row3);
+    put3.addColumn(cfName, cqName, HConstants.EMPTY_BYTE_ARRAY);
+
+    region.put(put1);
+    region.put(put2);
+    region.put(put3);
+    region.flush(true);
+    Scan scan = new Scan();
+    scan.setCacheBlocks(false);
+    scan.setReversed(true);
+    scan.setFilter(new FirstKeyOnlyFilter());
+    scan.addFamily(cfName);
+    RegionScanner scanner = region.getScanner(scan);
+    List<Cell> res = new ArrayList<Cell>();
+    int count = 1;
+    while (scanner.next(res)) {
+      count++;
+    }
+    assertEquals(Bytes.toString(res.get(0).getRowArray(), res.get(0).getRowOffset(), res.get(0)
+        .getRowLength()), "b");
+    assertEquals(Bytes.toString(res.get(1).getRowArray(), res.get(1).getRowOffset(), res.get(1)
+        .getRowLength()), "ab");
+    assertEquals(Bytes.toString(res.get(2).getRowArray(), res.get(2).getRowOffset(), res.get(2)
+        .getRowLength()), "a");
+    assertEquals(3, count);
+  }
+
+  @Test
+  public void testReverseScanWithPadding() throws Exception {
+    byte[] terminator = new byte[] { -1 };
+    byte[] row1 = Bytes.add(invert(Bytes.toBytes("a")), terminator);
+    byte[] row2 = Bytes.add(invert(Bytes.toBytes("ab")), terminator);
+    byte[] row3 = Bytes.add(invert(Bytes.toBytes("b")), terminator);
+
+    Put put1 = new Put(row1);
+    put1.addColumn(cfName, cqName, HConstants.EMPTY_BYTE_ARRAY);
+    Put put2 = new Put(row2);
+    put2.addColumn(cfName, cqName, HConstants.EMPTY_BYTE_ARRAY);
+    Put put3 = new Put(row3);
+    put3.addColumn(cfName, cqName, HConstants.EMPTY_BYTE_ARRAY);
+
+    region.put(put1);
+    region.put(put2);
+    region.put(put3);
+    region.flush(true);
+    Scan scan = new Scan();
+    scan.setCacheBlocks(false);
+    scan.setReversed(true);
+    scan.setFilter(new FirstKeyOnlyFilter());
+    scan.addFamily(cfName);
+    RegionScanner scanner = region.getScanner(scan);
+    List<Cell> res = new ArrayList<Cell>();
+    int count = 1;
+    while (scanner.next(res)) {
+      count++;
+    }
+    assertEquals(3, count);
+  }
+
+  private byte[] invert(byte[] bytes) {
+    byte[] newBytes = Arrays.copyOf(bytes, bytes.length);
+    for (int i = 0; i < newBytes.length; i++) {
+      newBytes[i] = (byte) (newBytes[i] ^ 0xFF);
+    }
+    return newBytes;
+  }
+}