diff --git a/blocks/library/quote/index.js b/blocks/library/quote/index.js
index ae78e477b1e9b6..cb384034c50751 100644
--- a/blocks/library/quote/index.js
+++ b/blocks/library/quote/index.js
@@ -13,7 +13,9 @@ registerBlock( 'core/quote', {
 	category: 'common',
 
 	attributes: {
-		value: ( node ) => query( 'blockquote > p', html() )( node ).join(),
+		value: ( node ) => query( 'blockquote > p', html() )( node )
+			.map( innerHTML => `<p>${ innerHTML }</p>` )
+			.join( '' ),
 		citation: html( 'footer' )
 	},
 
@@ -36,15 +38,13 @@ registerBlock( 'core/quote', {
 
 	save( attributes ) {
 		const { value, citation } = attributes;
-		return (
-			<blockquote>
-				{ value }
-				{ !! citation &&
-					<footer>
-						{ citation }
-					</footer>
-				}
-			</blockquote>
-		);
+		return [
+			'<blockquote>',
+			value,
+			citation
+				? `<footer>${ citation }</footer>`
+				: '',
+			'</blockquote>'
+		].join( '' );
 	}
 } );
diff --git a/blocks/library/quote/style.scss b/blocks/library/quote/style.scss
index bbf126ca75a4f9..78880c2b0d8aa1 100644
--- a/blocks/library/quote/style.scss
+++ b/blocks/library/quote/style.scss
@@ -14,7 +14,7 @@
 		margin-left: 1.3em;
 		position: relative;
 
-		&:after {
+		&:before {
 			content: '— ';
 			position: absolute;
 			left: -1.3em;