diff --git a/dist/vis/LineupVisWrapper.d.ts.map b/dist/vis/LineupVisWrapper.d.ts.map
index cb2cc453d..5fd5359bb 100644
--- a/dist/vis/LineupVisWrapper.d.ts.map
+++ b/dist/vis/LineupVisWrapper.d.ts.map
@@ -1 +1 @@
-{"version":3,"file":"LineupVisWrapper.d.ts","sourceRoot":"","sources":["../../src/vis/LineupVisWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuC,iBAAiB,EAAsC,MAAM,UAAU,CAAC;AAMtH,qBAAa,gBAAgB;IAWzB,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE;QACxB,QAAQ,EAAE,iBAAiB,CAAC;QAC5B;;;WAGG;QACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAC5C,GAAG,EAAE,QAAQ,CAAC;KACf;IAlBH;;OAEG;IACH,OAAO,CAAC,gCAAgC,CAAS;IAEjD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAU;gBAGL,KAAK,EAAE;QACxB,QAAQ,EAAE,iBAAiB,CAAC;QAC5B;;;WAGG;QACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAC5C,GAAG,EAAE,QAAQ,CAAC;KACf;IASH,eAAe,QAAO,MAAM,EAAE,CAI5B;IAEF,cAAc,MAAO,MAAM,UAazB;IAEF,eAAe,aAkEb;IAEF,eAAe,aASb;IAEF,IAAI,aAGF;CACH"}
\ No newline at end of file
+{"version":3,"file":"LineupVisWrapper.d.ts","sourceRoot":"","sources":["../../src/vis/LineupVisWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuC,iBAAiB,EAAsC,MAAM,UAAU,CAAC;AAMtH,qBAAa,gBAAgB;IAWzB,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE;QACxB,QAAQ,EAAE,iBAAiB,CAAC;QAC5B;;;WAGG;QACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAC5C,GAAG,EAAE,QAAQ,CAAC;KACf;IAlBH;;OAEG;IACH,OAAO,CAAC,gCAAgC,CAAS;IAEjD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAU;gBAGL,KAAK,EAAE;QACxB,QAAQ,EAAE,iBAAiB,CAAC;QAC5B;;;WAGG;QACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAC5C,GAAG,EAAE,QAAQ,CAAC;KACf;IASH,eAAe,QAAO,MAAM,EAAE,CAI5B;IAEF,cAAc,MAAO,MAAM,UAazB;IAEF,eAAe,aAqEb;IAEF,eAAe,aAeb;IAEF,IAAI,aAGF;CACH"}
\ No newline at end of file
diff --git a/dist/vis/LineupVisWrapper.js b/dist/vis/LineupVisWrapper.js
index d12b9cf3f..75d63bcd8 100644
--- a/dist/vis/LineupVisWrapper.js
+++ b/dist/vis/LineupVisWrapper.js
@@ -23,6 +23,9 @@ export class LineupVisWrapper {
             this.updateCustomVis();
         };
         this.updateCustomVis = () => {
+            if (this.viewable) {
+                return;
+            }
             const ranking = this.props.provider.getFirstRanking();
             const data = this.props.provider.viewRawRows(ranking.getOrder());
             const cols = [];
@@ -81,9 +84,17 @@ export class LineupVisWrapper {
         this.toggleCustomVis = () => {
             this.viewable = !this.viewable;
             this.node.style.display = this.viewable ? 'flex' : 'none';
-            this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ORDER_CHANGED}.track`, this.updateCustomVis);
-            this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ADD_COLUMN}.track`, this.updateCustomVis);
-            this.props.provider.on(`${LocalDataProvider.EVENT_SELECTION_CHANGED}.track`, this.updateCustomVis);
+            if (this.viewable) {
+                // TODO: Add unique ranking id to the event listener id to avoid removing EL of other vis wrappers
+                this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ORDER_CHANGED}.visWrapper`, this.updateCustomVis);
+                this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ADD_COLUMN}.visWrapper`, this.updateCustomVis);
+                this.props.provider.on(`${LocalDataProvider.EVENT_SELECTION_CHANGED}.visWrapper`, this.updateCustomVis);
+            }
+            else {
+                this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ORDER_CHANGED}.visWrapper`, null);
+                this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ADD_COLUMN}.visWrapper`, null);
+                this.props.provider.on(`${LocalDataProvider.EVENT_SELECTION_CHANGED}.visWrapper`, null);
+            }
             this.updateCustomVis();
         };
         this.hide = () => {
diff --git a/dist/vis/LineupVisWrapper.js.map b/dist/vis/LineupVisWrapper.js.map
index 34bf5115c..3fb0d0089 100644
--- a/dist/vis/LineupVisWrapper.js.map
+++ b/dist/vis/LineupVisWrapper.js.map
@@ -1 +1 @@
-{"version":3,"file":"LineupVisWrapper.js","sourceRoot":"","sources":["../../src/vis/LineupVisWrapper.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LineupVisWrapper.js","sourceRoot":"","sources":["../../src/vis/LineupVisWrapper.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/vis/LineupVisWrapper.ts b/src/vis/LineupVisWrapper.ts
index c8101e0c1..797400078 100644
--- a/src/vis/LineupVisWrapper.ts
+++ b/src/vis/LineupVisWrapper.ts
@@ -56,6 +56,9 @@ export class LineupVisWrapper {
   };
 
   updateCustomVis = () => {
+    if (this.viewable) {
+      return;
+    }
     const ranking = this.props.provider.getFirstRanking();
     const data = this.props.provider.viewRawRows(ranking.getOrder());
 
@@ -126,10 +129,16 @@ export class LineupVisWrapper {
   toggleCustomVis = () => {
     this.viewable = !this.viewable;
     this.node.style.display = this.viewable ? 'flex' : 'none';
-
-    this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ORDER_CHANGED}.track`, this.updateCustomVis);
-    this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ADD_COLUMN}.track`, this.updateCustomVis);
-    this.props.provider.on(`${LocalDataProvider.EVENT_SELECTION_CHANGED}.track`, this.updateCustomVis);
+    if (this.viewable) {
+      // TODO: Add unique ranking id to the event listener id to avoid removing EL of other vis wrappers
+      this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ORDER_CHANGED}.visWrapper`, this.updateCustomVis);
+      this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ADD_COLUMN}.visWrapper`, this.updateCustomVis);
+      this.props.provider.on(`${LocalDataProvider.EVENT_SELECTION_CHANGED}.visWrapper`, this.updateCustomVis);
+    } else {
+      this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ORDER_CHANGED}.visWrapper`, null);
+      this.props.provider.getFirstRanking().on(`${Ranking.EVENT_ADD_COLUMN}.visWrapper`, null);
+      this.props.provider.on(`${LocalDataProvider.EVENT_SELECTION_CHANGED}.visWrapper`, null);
+    }
 
     this.updateCustomVis();
   };