diff --git a/src/infrastructure/markup/PhabricatorMarkupEngine.php b/src/infrastructure/markup/PhabricatorMarkupEngine.php
index 35de846650..5422870b68 100644
--- a/src/infrastructure/markup/PhabricatorMarkupEngine.php
+++ b/src/infrastructure/markup/PhabricatorMarkupEngine.php
@@ -42,7 +42,7 @@ final class PhabricatorMarkupEngine extends Phobject {
   private $objects = array();
   private $viewer;
   private $contextObject;
-  private $version = 19;
+  private $version = 20;
   private $engineCaches = array();
   private $auxiliaryConfig = array();
 
diff --git a/src/infrastructure/markup/blockrule/PhutilRemarkupQuotedBlockRule.php b/src/infrastructure/markup/blockrule/PhutilRemarkupQuotedBlockRule.php
index ed87f7063d..9f2bd7a297 100644
--- a/src/infrastructure/markup/blockrule/PhutilRemarkupQuotedBlockRule.php
+++ b/src/infrastructure/markup/blockrule/PhutilRemarkupQuotedBlockRule.php
@@ -66,6 +66,8 @@ abstract class PhutilRemarkupQuotedBlockRule
     foreach ($text as $key => $line) {
       if (!strlen(trim($line))) {
         unset($text[$key]);
+      } else {
+        break;
       }
     }
 
diff --git a/src/infrastructure/markup/remarkup/__tests__/remarkup/quoted-paragraphs.txt b/src/infrastructure/markup/remarkup/__tests__/remarkup/quoted-paragraphs.txt
new file mode 100644
index 0000000000..de597b5e0a
--- /dev/null
+++ b/src/infrastructure/markup/remarkup/__tests__/remarkup/quoted-paragraphs.txt
@@ -0,0 +1,11 @@
+> x
+>
+> y
+~~~~~~~~~~
+<blockquote><p>x</p>
+
+<p>y</p></blockquote>
+~~~~~~~~~~
+> x
+>
+> y