1 files changed, 9 insertions, 1 deletions

diff --git a/app/assets/javascripts/boards/components/boards_selector.vue b/app/assets/javascripts/boards/components/boards_selector.vue
index b3fe52944dc..cc6fde92f9b 100644
--- a/app/assets/javascripts/boards/components/boards_selector.vue
+++ b/app/assets/javascripts/boards/components/boards_selector.vue
@@ -70,6 +70,11 @@ export default {
       required: false,
       default: () => ({}),
     },
+    isCurrentBoardLoading: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -92,6 +97,9 @@ export default {
     boardToUse() {
       return this.isApolloBoard ? this.boardApollo : this.board;
     },
+    isBoardToUseLoading() {
+      return this.isApolloBoard ? this.isCurrentBoardLoading : this.isBoardLoading;
+    },
     parentType() {
       return this.boardType;
     },
@@ -301,7 +309,7 @@ export default {
         data-qa-selector="boards_dropdown"
         toggle-class="dropdown-menu-toggle"
         menu-class="flex-column dropdown-extended-height"
-        :loading="isBoardLoading"
+        :loading="isBoardToUseLoading"
         :text="boardToUse.name"
         @show="loadBoards"
       >