1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_modal.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_modal.vue
index 41514d2d2f1..3af48635f3f 100644
--- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_modal.vue
+++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_modal.vue
@@ -93,6 +93,10 @@ export default {
       required: false,
       default: false,
     },
+    hasEnvScopeQuery: {
+      type: Boolean,
+      required: true,
+    },
     mode: {
       type: String,
       required: true,
@@ -147,7 +151,7 @@ export default {
       return !this.isTipDismissed && AWS_TOKEN_CONSTANTS.includes(this.variable.key);
     },
     environmentsList() {
-      if (this.glFeatures?.ciLimitEnvironmentScope) {
+      if (this.hasEnvScopeQuery) {
         return this.environments;
       }
 
@@ -385,6 +389,7 @@ export default {
             <ci-environments-dropdown
               v-if="areScopedVariablesAvailable"
               :are-environments-loading="areEnvironmentsLoading"
+              :has-env-scope-query="hasEnvScopeQuery"
               :selected-environment-scope="variable.environmentScope"
               :environments="environmentsList"
               @select-environment="setEnvironmentScope"