diff --git a/core/block_svg.ts b/core/block_svg.ts
index 295b806961b..a22af525cc0 100644
--- a/core/block_svg.ts
+++ b/core/block_svg.ts
@@ -269,7 +269,7 @@ export class BlockSvg
       const firstSibling: BlockSvg = surroundParent.getChildren(false)[0];
       const siblings: BlockSvg[] = [firstSibling];
       let nextSibling: BlockSvg | null = firstSibling;
-      while ((nextSibling = nextSibling.getNextBlock())) {
+      while ((nextSibling = nextSibling?.getNextBlock())) {
         siblings.push(nextSibling);
       }
       return siblings;