diff --git a/CHANGES.txt b/CHANGES.txt
index d773c9d519..48321f19ba 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 3.0.4
  * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
-
+Merged from 2.2.6
+ * Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
 
 3.0.3
  * Remove double initialization of newly added tables (CASSANDRA-11027)
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 4e86efe916..1c5092f5c6 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -78,7 +78,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
         SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
     }
 
-    private ScheduledFuture<?> scheduledGossipTask;
+    private volatile ScheduledFuture<?> scheduledGossipTask;
     private static final ReentrantLock taskLock = new ReentrantLock();
     public final static int intervalInMillis = 1000;
     public final static int QUARANTINE_DELAY = StorageService.RING_DELAY * 2;