diff --git a/CHANGES.txt b/CHANGES.txt
index f296d92c03..0c76bd06e2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * fix start key/end token validation for wide row iteration (CASSANDRA-5168)
  * add ConfigHelper support for Thrift frame and max message sizes (CASSANDRA-5188)
  * fix nodetool repair not fail on node down (CASSANDRA-5203)
+ * always collect tombstone hints (CASSANDRA-5068)
 
 
 1.1.9
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 12a2814c43..eea4ec4c5a 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -377,16 +377,13 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
             }
         }
 
-        if (rowsReplayed > 0)
+        try
         {
-            try
-            {
-                compact().get();
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e);
-            }
+            compact().get();
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
         }
 
         logger_.info(String.format("Finished hinted handoff of %s rows to endpoint %s", rowsReplayed, endpoint));