diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index 7218aa6ce..40bdac284 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -22,6 +22,7 @@ import net.openhft.chronicle.bytes.Bytes;
 import net.openhft.chronicle.bytes.BytesStore;
 import net.openhft.chronicle.bytes.PointerBytesStore;
 import net.openhft.chronicle.core.Jvm;
+import net.openhft.chronicle.core.analytics.AnalyticsFacade;
 import net.openhft.chronicle.core.io.IOTools;
 import net.openhft.chronicle.hash.ChronicleHashClosedException;
 import net.openhft.chronicle.hash.ChronicleHashCorruption;
@@ -113,7 +114,7 @@ public class VanillaChronicleMap<K, V, R>
         initTransientsFromBuilder(builder);
         initTransients();
 
-        final Map<String, String> additionalEventParameters = new HashMap<>();
+        final Map<String, String> additionalEventParameters = AnalyticsFacade.standardAdditionalProperties();
         additionalEventParameters.put("key_type", keyClass.getTypeName());
         additionalEventParameters.put("value_type", valueClass.getTypeName());
         additionalEventParameters.put("entries", Long.toString(builder.entries()));
diff --git a/src/main/java/net/openhft/chronicle/map/internal/AnalyticsHolder.java b/src/main/java/net/openhft/chronicle/map/internal/AnalyticsHolder.java
index f9886dff5..c516f93f5 100644
--- a/src/main/java/net/openhft/chronicle/map/internal/AnalyticsHolder.java
+++ b/src/main/java/net/openhft/chronicle/map/internal/AnalyticsHolder.java
@@ -8,11 +8,8 @@ public enum AnalyticsHolder {;
     // Todo: VERSION is "unknown" for some reason
     private static final String VERSION = PomProperties.version("net.openhft", "chronicle-map");
 
-    private static final AnalyticsFacade ANALYTICS = AnalyticsFacade.standardBuilder(
-            "G-TDTJG5CT6G",
-            "J8qsWGHgQP6CLs43mQ10KQ",
-            VERSION)
-            .withReportDespiteJUnit()
+    private static final AnalyticsFacade ANALYTICS = AnalyticsFacade.standardBuilder("G-TDTJG5CT6G", "J8qsWGHgQP6CLs43mQ10KQ", VERSION)
+            //.withReportDespiteJUnit()
             .build();
 
     public static AnalyticsFacade instance() {