diff --git a/src/applications/paste/conduit/ConduitAPI_paste_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_Method.php
index 830135d567..a92857bef8 100644
--- a/src/applications/paste/conduit/ConduitAPI_paste_Method.php
+++ b/src/applications/paste/conduit/ConduitAPI_paste_Method.php
@@ -17,7 +17,7 @@ abstract class ConduitAPI_paste_Method extends ConduitAPIMethod {
       'language'    => $paste->getLanguage(),
       'uri'         => PhabricatorEnv::getProductionURI('/P'.$paste->getID()),
       'parentPHID'  => $paste->getParentPHID(),
-      'content'     => $paste->getContent(),
+      'content'     => $paste->getRawContent(),
     );
   }
 
diff --git a/src/applications/paste/controller/PhabricatorPasteEditController.php b/src/applications/paste/controller/PhabricatorPasteEditController.php
index f5ff7ed17b..1d3e8515b8 100644
--- a/src/applications/paste/controller/PhabricatorPasteEditController.php
+++ b/src/applications/paste/controller/PhabricatorPasteEditController.php
@@ -28,6 +28,7 @@ final class PhabricatorPasteEditController extends PhabricatorPasteController {
           ->setViewer($user)
           ->withIDs(array($parent_id))
           ->needContent(true)
+          ->needRawContent(true)
           ->execute();
         $parent = head($parent);
 
@@ -95,7 +96,7 @@ final class PhabricatorPasteEditController extends PhabricatorPasteController {
       if ($is_create && $parent) {
         $paste->setTitle('Fork of '.$parent->getFullName());
         $paste->setLanguage($parent->getLanguage());
-        $text = $parent->getContent();
+        $text = $parent->getRawContent();
       }
     }