diff --git a/src/fields/Matrix.php b/src/fields/Matrix.php
index 3522133392a..5b6360e5409 100644
--- a/src/fields/Matrix.php
+++ b/src/fields/Matrix.php
@@ -1310,8 +1310,10 @@ private function _createBlocksFromSerializedData(array $value, ElementInterface
                     // Duplicate it as a draft. (We'll drop its draft status from `Matrix::saveField()`.)
                     $block = Craft::$app->getDrafts()->createDraft($block, Craft::$app->getUser()->getId(), null, null, [
                         'canonicalId' => $block->id,
-                        'primaryOwnerId' => $element->id,
-                        'owner' => $element,
+                        // #12176 - setting primaryOwnerId and owner causes an infinite loop
+                            // when autosaving drafts, if matrix propagation method is set to custom
+                        //'primaryOwnerId' => $element->id,
+                        //'owner' => $element,
                         'siteId' => $element->siteId,
                         'propagating' => false,
                         'markAsSaved' => false,