diff --git a/src/infrastructure/markup/PhabricatorMarkupEngine.php b/src/infrastructure/markup/PhabricatorMarkupEngine.php
index 26851abd5f..d897314245 100644
--- a/src/infrastructure/markup/PhabricatorMarkupEngine.php
+++ b/src/infrastructure/markup/PhabricatorMarkupEngine.php
@@ -46,6 +46,8 @@ final class PhabricatorMarkupEngine extends Phobject {
   private $engineCaches = array();
   private $auxiliaryConfig = array();
 
+  private static $engineStack = array();
+
 
 /* -(  Markup Pipeline  )---------------------------------------------------- */
 
@@ -103,6 +105,24 @@ final class PhabricatorMarkupEngine extends Phobject {
    * @task markup
    */
   public function process() {
+    self::$engineStack[] = $this;
+
+    try {
+      $result = $this->execute();
+    } finally {
+      array_pop(self::$engineStack);
+    }
+
+    return $result;
+  }
+
+  public static function isRenderingEmbeddedContent() {
+    // See T13678. This prevents cycles when rendering embedded content that
+    // itself has remarkup fields.
+    return (count(self::$engineStack) > 1);
+  }
+
+  private function execute() {
     $keys = array();
     foreach ($this->objects as $key => $info) {
       if (!isset($info['markup'])) {
diff --git a/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php b/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
index 7fb997b2c5..5ab033d6b1 100644
--- a/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
+++ b/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
@@ -126,6 +126,12 @@ abstract class PhabricatorObjectRemarkupRule extends PhutilRemarkupRule {
       return $this->renderObjectTagForMail($name, $href, $handle);
     }
 
+    // See T13678. If we're already rendering embedded content, render a
+    // default reference instead to avoid cycles.
+    if (PhabricatorMarkupEngine::isRenderingEmbeddedContent()) {
+      return $this->renderDefaultObjectEmbed($object, $handle);
+    }
+
     return $this->renderObjectEmbed($object, $handle, $options);
   }
 
@@ -133,6 +139,12 @@ abstract class PhabricatorObjectRemarkupRule extends PhutilRemarkupRule {
     $object,
     PhabricatorObjectHandle $handle,
     $options) {
+    return $this->renderDefaultObjectEmbed($object, $handle);
+  }
+
+  final protected function renderDefaultObjectEmbed(
+    $object,
+    PhabricatorObjectHandle $handle) {
 
     $name = $handle->getFullName();
     $href = $handle->getURI();