1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js
index 31369b169f5..08c195469e3 100644
--- a/app/assets/javascripts/diffs/store/mutations.js
+++ b/app/assets/javascripts/diffs/store/mutations.js
@@ -39,6 +39,7 @@ export default {
       viewDiffsFileByFile,
       mrReviews,
       diffViewType,
+      perPage,
     } = options;
     Object.assign(state, {
       endpoint,
@@ -54,6 +55,7 @@ export default {
       viewDiffsFileByFile,
       mrReviews,
       diffViewType,
+      perPage,
     });
   },
 
@@ -198,9 +200,10 @@ export default {
       return {
         ...line,
         discussionsExpanded:
-          line.discussions && line.discussions.length
+          line.discussionsExpanded ||
+          (line.discussions && line.discussions.length
             ? line.discussions.some((disc) => !disc.resolved) || isLineNoteTargeted
-            : false,
+            : false),
       };
     };