diff --git a/src/mfm/parse/elements/quote.ts b/src/mfm/parse/elements/quote.ts
index ea99240d5..aa932cbf8 100644
--- a/src/mfm/parse/elements/quote.ts
+++ b/src/mfm/parse/elements/quote.ts
@@ -9,7 +9,7 @@ export type TextElementQuote = {
 };
 
 export default function(text: string) {
-	const match = text.match(/^"([\s\S]+?)\n"/);
+	const match = text.match(/^"([\s\S]+?)\n"/) || text.match(/^>([\s\S]+?)\n\n/) || text.match(/^\n>([\s\S]+?)\n\n/) || text.match(/^>([\s\S]+?)$/);
 	if (!match) return null;
 	const quote = match[0];
 	return {
diff --git a/test/mfm.ts b/test/mfm.ts
index a015092f0..25a7c290e 100644
--- a/test/mfm.ts
+++ b/test/mfm.ts
@@ -87,6 +87,20 @@ describe('Text', () => {
 			], tokens2);
 		});
 
+		it('quote', () => {
+			const tokens1 = analyze('> foo\nbar\baz');
+			assert.deepEqual([
+				{ type: 'quote', content: '> foo\nbar\baz', quote: 'foo\nbar\baz' }
+			], tokens1);
+
+			const tokens2 = analyze('before\n> foo\nbar\baz\n\nafter');
+			assert.deepEqual([
+				{ type: 'text', content: 'before' },
+				{ type: 'quote', content: '\n> foo\nbar\baz\n\n', quote: 'foo\nbar\baz' },
+				{ type: 'text', content: 'after' }
+			], tokens2);
+		});
+
 		it('url', () => {
 			const tokens = analyze('https://himasaku.net');
 			assert.deepEqual([{