diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index a8b14b2ada..476af88010 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -279,7 +279,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
         // 5. Do major compaction to clean up all deletes etc.
 
         // find the hints for the node using its token.
-        UUID hostId = StorageService.instance.getTokenMetadata().getHostId(endpoint);
+        UUID hostId = Gossiper.instance.getHostId(endpoint);
         logger.info("Started hinted handoff for host: {} with IP: {}", hostId, endpoint);
         final ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
         DecoratedKey epkey =  StorageService.getPartitioner().decorateKey(hostIdBytes);