diff --git a/packages/editor/api-report.md b/packages/editor/api-report.md
index c3a7827ab..1cc37b981 100644
--- a/packages/editor/api-report.md
+++ b/packages/editor/api-report.md
@@ -1375,7 +1375,7 @@ export interface MatModel {
 export const MAX_PAGES = 40;
 
 // @internal (undocumented)
-export const MAX_SHAPES_PER_PAGE = 2000;
+export const MAX_SHAPES_PER_PAGE = 20000;
 
 // @internal (undocumented)
 export const MAX_ZOOM = 8;
diff --git a/packages/editor/src/lib/components/default-components/DefaultCanvas.tsx b/packages/editor/src/lib/components/default-components/DefaultCanvas.tsx
index ab569d855..9dd688150 100644
--- a/packages/editor/src/lib/components/default-components/DefaultCanvas.tsx
+++ b/packages/editor/src/lib/components/default-components/DefaultCanvas.tsx
@@ -382,10 +382,10 @@ function ShapesToDisplay() {
 				}
 			} else if (shapePortalInfo.addedToDom && shape.isCulled) {
 				wrapperDiv.current?.removeChild(shapePortalInfo.container)
-				portalInfo.set(shape.id, { container: shapePortalInfo.container, addedToDom: false })
+				shapePortalInfo.addedToDom = false
 			} else if (!shapePortalInfo.addedToDom && !shape.isCulled) {
 				wrapperDiv.current?.appendChild(shapePortalInfo.container)
-				portalInfo.set(shape.id, { container: shapePortalInfo.container, addedToDom: true })
+				shapePortalInfo.addedToDom = true
 			}
 		})
 	}