diff --git a/end-to-end-test/shared/wdio/wdio.conf.js b/end-to-end-test/shared/wdio/wdio.conf.js
index ea20329b320..9afa269e810 100644
--- a/end-to-end-test/shared/wdio/wdio.conf.js
+++ b/end-to-end-test/shared/wdio/wdio.conf.js
@@ -165,7 +165,8 @@ exports.config = {
     //
     //
 
-    specs: [SPEC_FILE_PATTERN],
+    // specs: [SPEC_FILE_PATTERN],
+    specs: ['./local/specs/hide-download-controls.spec.js'],
 
     exclude: ['./local/specs/web-tour.spec.js'],
 
diff --git a/src/pages/groupComparison/Survival.tsx b/src/pages/groupComparison/Survival.tsx
index 49b4d634eab..c733cfb02b9 100644
--- a/src/pages/groupComparison/Survival.tsx
+++ b/src/pages/groupComparison/Survival.tsx
@@ -1099,11 +1099,8 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
 
             // set default plot if applicable
             if (
-                (!doNotSetDefaultPlot &&
-                    this.selectedSurvivalPlotPrefix === undefined) ||
-                !this.props.store.survivalClinicalAttributesPrefix.result?.includes(
-                    this.selectedSurvivalPlotPrefix || ''
-                )
+                !doNotSetDefaultPlot &&
+                this.selectedSurvivalPlotPrefix === undefined
             ) {
                 // if the table exists pick the first one from the table's store for consistency
                 if (this.survivalPrefixTable.component) {
@@ -1125,6 +1122,16 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
                     this.selectedSurvivalPlotPrefix
                 ];
                 const key = this.selectedSurvivalPlotPrefix;
+
+                // if (!this.props.store.survivalClinicalAttributesPrefix.result?.includes(
+                //     key
+                // )) {
+                //     this.setSurvivalPlotPrefix(
+                //         this.survivalPrefixTableDataStore.result!.getSortedFilteredData()[0]
+                //             .prefix
+                //     );
+                // }
+
                 if (value.length > 0) {
                     if (
                         this.props.store.survivalDescriptions &&