diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/LongMap.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/LongMap.java
index dfb549b57784a..2f5be2e67b45e 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/LongMap.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/LongMap.java
@@ -162,6 +162,7 @@ public void expand(int size) {
         objects = temp.objects;
         shift = temp.shift;
         bitSet = temp.bitSet;
+        count = temp.count;
     }
 
     public void put(long id, T object) {
@@ -245,6 +246,9 @@ public void forEach(Consumer<T> consumer) {
         for (int i = 0; i < keys.length; i++) {
             T o = objects[i];
             if (o != null) {
+                if (o == NULL_OBJECT) {
+                    o = null;
+                }
                 consumer.accept(o);
             }
         }