diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 8a7d86b0..77620d34 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -192,6 +192,22 @@ const obj = {
 }
 ```
 
+### JavaScript: Add parenthesis in JSX spread element with logical expressions ([#6130] by [@duailibe])
+
+Previously, Prettier didn't add parenthesis in JSX spread elements because they aren't necessary, but for the sake of consistency with spread operator in objects and arrays, we'll add to JSX as well.
+
+<!-- prettier-ignore -->
+```js
+// Input
+<Component {...(props || {})} />;
+
+// Output (Prettier stable)
+<Component {...props || {}} />;
+
+// Output (Prettier master)
+<Component {...(props || {})} />;
+```
+
 ### Markdown: correctly determine count of backticks in inline code ([#6110] by [@belochub])
 
 By the CommonMark spec, it is required to 'choose a string of `n` backtick characters as delimiters, where the code does not contain any strings of exactly `n` backtick characters.'
@@ -224,6 +240,7 @@ This changes the method of finding the required count of backticks from using 2
 [#6115]: https://github.com/prettier/prettier/pull/6115
 [#6116]: https://github.com/prettier/prettier/pull/6116
 [#6119]: https://github.com/prettier/prettier/pull/6119
+[#6130]: https://github.com/prettier/prettier/pull/6130
 [@belochub]: https://github.com/belochub
 [@brainkim]: https://github.com/brainkim
 [@duailibe]: https://github.com/duailibe
diff --git a/src/language-js/needs-parens.js b/src/language-js/needs-parens.js
index cc1924d5..d30944ec 100644
--- a/src/language-js/needs-parens.js
+++ b/src/language-js/needs-parens.js
@@ -314,6 +314,7 @@ function needsParens(path, options) {
         case "TSTypeAssertion":
         case "TaggedTemplateExpression":
         case "UnaryExpression":
+        case "JSXSpreadAttribute":
         case "SpreadElement":
         case "SpreadProperty":
         case "BindExpression":
diff --git a/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap
index 03f389b1..95b8fe94 100644
--- a/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap
@@ -8,6 +8,10 @@ printWidth: 80
 =====================================input======================================
 <div {...a}/>;
 
+<div {...(a || {})} />;
+
+<div {...(cond ? foo : bar)} />;
+
 <div {...a /* comment */}/>;
 
 <div {/* comment */...a}/>;
@@ -31,6 +35,10 @@ printWidth: 80
 =====================================output=====================================
 <div {...a} />;
 
+<div {...(a || {})} />;
+
+<div {...(cond ? foo : bar)} />;
+
 <div {...a /* comment */} />;
 
 <div {/* comment */ ...a} />;
diff --git a/tests/jsx_spread/attribute.js b/tests/jsx_spread/attribute.js
index 6c76903a..2f12f980 100644
--- a/tests/jsx_spread/attribute.js
+++ b/tests/jsx_spread/attribute.js
@@ -1,5 +1,9 @@
 <div {...a}/>;
 
+<div {...(a || {})} />;
+
+<div {...(cond ? foo : bar)} />;
+
 <div {...a /* comment */}/>;
 
 <div {/* comment */...a}/>;