diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -241,6 +241,7 @@ public class Gossiper implements IFailureDetectionEventListener
     */
     void evictFromMembership(InetAddress endpoint)
     {
+        endpointStateMap_.remove(endpoint);
         unreachableEndpoints_.remove(endpoint);
     }
 
@@ -456,7 +457,6 @@ public class Gossiper implements IFailureDetectionEventListener
                     if (logger_.isDebugEnabled())
                         logger_.debug(QUARANTINE_DELAY + " elapsed, " + entry.getKey() + " gossip quarantine over");
                     justRemovedEndpoints_.remove(entry.getKey());
-                    endpointStateMap_.remove(entry.getKey());
                 }
             }
         }
Keep endpoint state until aVeryLongTime.
Patch by brandonwilliams reviewed by gdusbabek for CASSANDRA-<I>

git-svn-id: <URL>