diff --git a/src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java b/src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java
index 39d6c49..9bd838b 100755
--- a/src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java
+++ b/src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java
@@ -59,6 +59,11 @@
 
     private final KryoFactory kryoFactory = new KryoFactory();
 
+    //
+    // NOTE: eventChannels is kept thread safe by using explicit "synchronized"
+    // blocks below. Those are needed to protect the integrity of each entry
+    // instance, and avoid preemption during channel creation/startup.
+    //
     private final Map<String, IEventChannel<?, ?>> eventChannels = new HashMap<>();
 
     // State related to the packet out map