diff --git a/src/display/annotation_storage.js b/src/display/annotation_storage.js
index 1c9b1451a..d9c7bc21a 100644
--- a/src/display/annotation_storage.js
+++ b/src/display/annotation_storage.js
@@ -18,7 +18,7 @@
  */
 class AnnotationStorage {
   constructor() {
-    this._storage = Object.create(null);
+    this._storage = new Map();
   }
 
   /**
@@ -32,11 +32,11 @@ class AnnotationStorage {
    * @returns {Object}
    */
   getOrCreateValue(key, defaultValue) {
-    if (key in this._storage) {
-      return this._storage[key];
+    if (this._storage.has(key)) {
+      return this._storage.get(key);
     }
 
-    this._storage[key] = defaultValue;
+    this._storage.set(key, defaultValue);
     return defaultValue;
   }
 
@@ -49,11 +49,18 @@ class AnnotationStorage {
    * @param {Object} value
    */
   setValue(key, value) {
-    this._storage[key] = value;
+    this._storage.set(key, value);
   }
 
   getAll() {
-    return this._storage;
+    if (this._storage.size === 0) {
+      return null;
+    }
+    return Object.fromEntries(this._storage);
+  }
+
+  get size() {
+    return this._storage.size;
   }
 }
 
diff --git a/src/display/api.js b/src/display/api.js
index c2c32197d..b8d66dd95 100644
--- a/src/display/api.js
+++ b/src/display/api.js
@@ -632,14 +632,13 @@ class PDFDocumentProxy {
   constructor(pdfInfo, transport) {
     this._pdfInfo = pdfInfo;
     this._transport = transport;
-    this._annotationStorage = new AnnotationStorage();
   }
 
   /**
    * @type {AnnotationStorage} Storage for annotation data in forms.
    */
   get annotationStorage() {
-    return this._annotationStorage;
+    return shadow(this, "annotationStorage", new AnnotationStorage());
   }
 
   /**