diff --git a/docs/notes/bugfix-21271.md b/docs/notes/bugfix-21271.md
new file mode 100644
index 00000000000..d93a7658584
--- /dev/null
+++ b/docs/notes/bugfix-21271.md
@@ -0,0 +1 @@
+# Fix crash when setting the markerpoints of a graphic in a repeat loop
diff --git a/engine/src/exec-interface-graphic.cpp b/engine/src/exec-interface-graphic.cpp
index 966b47e4524..00ce2d25b88 100644
--- a/engine/src/exec-interface-graphic.cpp
+++ b/engine/src/exec-interface-graphic.cpp
@@ -781,6 +781,7 @@ void MCGraphic::SetMarkerPoints(MCExecContext& ctxt, uindex_t p_count, MCPoint*
     {
         flags &= ~F_MARKER_DRAWN;
         delete[] markerpoints;
+		markerpoints = NULL;
         nmarkerpoints = 0;
     }
     else