1 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/boards/components/board_column.vue b/app/assets/javascripts/boards/components/board_column.vue
index 708e1539c6e..83ba538168a 100644
--- a/app/assets/javascripts/boards/components/board_column.vue
+++ b/app/assets/javascripts/boards/components/board_column.vue
@@ -20,6 +20,10 @@ export default {
       type: String,
       required: true,
     },
+    filters: {
+      type: Object,
+      required: true,
+    },
   },
   computed: {
     ...mapState(['filterParams', 'highlightedLists']),
@@ -33,11 +37,14 @@ export default {
     isListDraggable() {
       return isListDraggable(this.list);
     },
+    filtersToUse() {
+      return this.isApolloBoard ? this.filters : this.filterParams;
+    },
   },
   watch: {
     filterParams: {
       handler() {
-        if (this.list.id && !this.list.collapsed) {
+        if (!this.isApolloBoard && this.list.id && !this.list.collapsed) {
           this.fetchItemsForList({ listId: this.list.id });
         }
       },
@@ -46,7 +53,7 @@ export default {
     },
     'list.id': {
       handler(id) {
-        if (id) {
+        if (!this.isApolloBoard && id) {
           this.fetchItemsForList({ listId: this.list.id });
         }
       },
@@ -83,13 +90,13 @@ export default {
       class="board-inner gl-display-flex gl-flex-direction-column gl-relative gl-h-full gl-rounded-base gl-bg-gray-50"
       :class="{ 'board-column-highlighted': highlighted }"
     >
-      <board-list-header :list="list" />
+      <board-list-header :list="list" :filter-params="filtersToUse" />
       <board-list
         ref="board-list"
         :board-id="boardId"
         :board-items="listItems"
         :list="list"
-        :filter-params="filterParams"
+        :filter-params="filtersToUse"
       />
     </div>
   </div>